Change GPUInfo to handle multiple GPUs.

chrome/browser/ui/webui/flash_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/flash_ui.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 318 matching lines @@
           AddPair(list, ASCIIToUTF16("Driver display name"), it2->second);
         }
       }
     }
   }
 #endif
 
   AddPair(list, string16(), "--- GPU driver, more information ---");
   AddPair(list,
           ASCIIToUTF16("Vendor Id"),
-          base::StringPrintf("0x%04x", gpu_info.vendor_id));
+          base::StringPrintf("0x%04x", gpu_info.gpu.vendor_id));
   AddPair(list,
           ASCIIToUTF16("Device Id"),
-          base::StringPrintf("0x%04x", gpu_info.device_id));
+          base::StringPrintf("0x%04x", gpu_info.gpu.device_id));
   AddPair(list, ASCIIToUTF16("Driver vendor"), gpu_info.driver_vendor);
   AddPair(list, ASCIIToUTF16("Driver version"), gpu_info.driver_version);
   AddPair(list, ASCIIToUTF16("Driver date"), gpu_info.driver_date);
   AddPair(list,
           ASCIIToUTF16("Pixel shader version"),
           gpu_info.pixel_shader_version);
   AddPair(list,
           ASCIIToUTF16("Vertex shader version"),
           gpu_info.vertex_shader_version);
   AddPair(list, ASCIIToUTF16("GL version"), gpu_info.gl_version);
@@ skipping 24 matching lines @@
   // Set up the about:flash source.
   Profile* profile = Profile::FromWebUI(web_ui);
   ChromeURLDataManager::AddDataSource(profile, CreateFlashUIHTMLSource());
 }
 
 // static
 base::RefCountedMemory* FlashUI::GetFaviconResourceBytes() {
   // Use the default icon for now.
   return NULL;
 }