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

components/autofill/browser/risk/fingerprint.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 "components/autofill/browser/risk/fingerprint.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/cpu.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "base/sys_info.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "components/autofill/browser/risk/proto/fingerprint.pb.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/font_list_async.h"
 #include "content/public/browser/geolocation_provider.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/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/geoposition.h"
-#include "content/public/common/gpu_info.h"
+#include "gpu/config/gpu_info.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebScreenInfo.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "webkit/plugins/webplugininfo.h"
 
 using WebKit::WebScreenInfo;
 
 namespace autofill {
 namespace risk {
@@ skipping 112 matching lines @@
 
 // Writes info about the machine's CPU into the |machine|.
 void AddCpuInfoToFingerprint(Fingerprint_MachineCharacteristics* machine) {
   base::CPU cpu;
   machine->mutable_cpu()->set_vendor_name(cpu.vendor_name());
   machine->mutable_cpu()->set_brand(cpu.cpu_brand());
 }
 
 // Writes info about the machine's GPU into the |machine|.
 void AddGpuInfoToFingerprint(Fingerprint_MachineCharacteristics* machine) {
-  const content::GPUInfo& gpu_info =
+  const gpu::GPUInfo& gpu_info =
       content::GpuDataManager::GetInstance()->GetGPUInfo();
   DCHECK(gpu_info.finalized);
 
   Fingerprint_MachineCharacteristics_Graphics* graphics =
       machine->mutable_graphics_card();
   graphics->set_vendor_id(gpu_info.gpu.vendor_id);
   graphics->set_device_id(gpu_info.gpu.device_id);
   graphics->set_driver_version(gpu_info.driver_version);
   graphics->set_driver_date(gpu_info.driver_date);
 
@@ skipping 303 matching lines @@
   // This class is responsible for freeing its own memory.
   new FingerprintDataLoader(gaia_id, window_bounds, content_bounds, screen_info,
                             version, charset, accept_languages, install_time,
                             dialog_type, app_locale, callback);
 }
 
 }  // namespace internal
 
 }  // namespace risk
 }  // namespace autofill