Fix GetAMDVideoCardInfo() linkage for Chrome non-Official builds.

Both BULID files and source code were checking for a Chrome-branded build, but
not also an Official build type.

BUG=388419
TBR=piman@chromium.org

Review URL: https://codereview.chromium.org/406523006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284609 0039d316-1c4b-4281-b951-d872f2087c98

gpu/config/BUILD.gn

@@ -50,7 +50,7 @@ source_set("config") {
     deps += [ "//third_party/libxml" ]
     libs = [ "dxguid.lib", "setupapi.lib" ]
 
-    if (is_chrome_branded) {
+    if (is_chrome_branded && is_official_build) {
       sources += [
         "//third_party/amd/AmdCfxPxExt.h",
         "//third_party/amd/amd_videocard_info_win.cc",

gpu/config/gpu_info_collector_win.cc

@@ -360,15 +360,15 @@ void CollectD3D11Support() {
 }
 }  // namespace anonymous
 
-#if !defined(GOOGLE_CHROME_BUILD)
+#if defined(GOOGLE_CHROME_BUILD) && defined(OFFICIAL_BUILD)
+// This function has a real implementation for official builds that can
+// be found in src/third_party/amd.
+void GetAMDVideocardInfo(GPUInfo* gpu_info);
+#else
 void GetAMDVideocardInfo(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
   return;
 }
-#else
-// This function has a real implementation for official builds that can
-// be found in src/third_party/amd.
-void GetAMDVideocardInfo(GPUInfo* gpu_info);
 #endif
 
 bool CollectDriverInfoD3D(const std::wstring& device_id,

gpu/gpu_config.gypi

@@ -57,7 +57,7 @@
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
     }],
-    ['OS=="win" and branding=="Chrome"', {
+    ['OS=="win" and branding=="Chrome" and buildtype=="Official"', {
       'sources': [
         '../third_party/amd/AmdCfxPxExt.h',
         '../third_party/amd/amd_videocard_info_win.cc',