Move GPU device/driver info related code from content to gpu.

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 15 matching lines @@
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
-#include "content/public/common/gpu_info.h"
+#include "gpu/config/gpu_info.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/plugins/plugin_constants.h"
 #include "webkit/plugins/webplugininfo.h"
 
 #if defined(OS_WIN)
@@ skipping 260 matching lines @@
     }
   } else {
     AddPair(list, ASCIIToUTF16("Crash Reporting"),
                   "Enable crash reporting to see crash IDs");
     AddPair(list, ASCIIToUTF16("For more details"),
                   chrome::kLearnMoreReportingURL);
   }
 
   // GPU information.
   AddPair(list, string16(), "--- GPU information ---");
-  content::GPUInfo gpu_info = GpuDataManager::GetInstance()->GetGPUInfo();
+  gpu::GPUInfo gpu_info = GpuDataManager::GetInstance()->GetGPUInfo();
 
   std::string reason;
   if (!GpuDataManager::GetInstance()->GpuAccessAllowed(&reason)) {
     AddPair(list, ASCIIToUTF16("WARNING:"),
             "GPU access is not allowed: " + reason);
   }
 #if defined(OS_WIN)
-  const content::DxDiagNode& node = gpu_info.dx_diagnostics;
-  for (std::map<std::string, content::DxDiagNode>::const_iterator it =
+  const gpu::DxDiagNode& node = gpu_info.dx_diagnostics;
+  for (std::map<std::string, gpu::DxDiagNode>::const_iterator it =
            node.children.begin();
        it != node.children.end();
        ++it) {
     for (std::map<std::string, std::string>::const_iterator it2 =
              it->second.values.begin();
          it2 != it->second.values.end();
          ++it2) {
       if (!it2->second.empty()) {
         if (it2->first == "szDescription") {
           AddPair(list, ASCIIToUTF16("Graphics card"), it2->second);
@@ skipping 52 matching lines @@
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, CreateFlashUIHTMLSource());
 }
 
 // static
 base::RefCountedMemory* FlashUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   // Use the default icon for now.
   return NULL;
 }