Add bits to indicate which parts of GPUInfo are collected.

components/autofill/content/browser/risk/fingerprint.cc

 // Copyright 2013 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.
 //
 // Generating a fingerprint consists of two major steps:
 //   (1) Gather all the necessary data.
 //   (2) Write it into a protocol buffer.
 //
 // Step (2) is as simple as it sounds -- it's really just a matter of copying
 // data.  Step (1) requires waiting on several asynchronous callbacks, which are
@@ skipping 141 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 gpu::GPUInfo& gpu_info =
-      content::GpuDataManager::GetInstance()->GetGPUInfo();
-  if (!gpu_info.finalized)
+void AddGpuInfoToFingerprint(Fingerprint::MachineCharacteristics* machine,
+                             const content::GpuDataManager& gpu_data_manager) {
+  if (!gpu_data_manager.IsEssentialGpuInfoAvailable())
     return;
 
+  const gpu::GPUInfo gpu_info = gpu_data_manager.GetGPUInfo();
+
   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);
 
   Fingerprint::MachineCharacteristics::Graphics::PerformanceStatistics*
       gpu_performance = graphics->mutable_performance_statistics();
   gpu_performance->set_graphics_score(gpu_info.performance_stats.graphics);
@@ skipping 111 matching lines @@
       weak_ptr_factory_(this),
       callback_(callback) {
   DCHECK(!install_time_.is_null());
 
   timeout_timer_.Start(FROM_HERE, timeout,
                        base::Bind(&FingerprintDataLoader::MaybeFillFingerprint,
                                   weak_ptr_factory_.GetWeakPtr()));
 
   // Load GPU data if needed.
   if (gpu_data_manager_->GpuAccessAllowed(NULL) &&
-      !gpu_data_manager_->IsCompleteGpuInfoAvailable()) {
+      !gpu_data_manager_->IsEssentialGpuInfoAvailable()) {
     gpu_observer_.Add(gpu_data_manager_);
     gpu_data_manager_->RequestCompleteGpuInfoIfNeeded();
   }
 
 #if defined(ENABLE_PLUGINS)
   // Load plugin data.
   content::PluginService::GetInstance()->GetPlugins(
       base::Bind(&FingerprintDataLoader::OnGotPlugins,
                  weak_ptr_factory_.GetWeakPtr()));
 #else
   waiting_on_plugins_ = false;
 #endif
 
   // Load font data.
   content::GetFontListAsync(
       base::Bind(&FingerprintDataLoader::OnGotFonts,
                  weak_ptr_factory_.GetWeakPtr()));
 
   // Load geolocation data.
   geolocation_subscription_ = content::GeolocationProvider::GetInstance()->
       AddLocationUpdateCallback(
           base::Bind(&FingerprintDataLoader::OnGotGeoposition,
                       weak_ptr_factory_.GetWeakPtr()),
           false);
 }
 
 void FingerprintDataLoader::OnGpuInfoUpdate() {
-  if (!gpu_data_manager_->IsCompleteGpuInfoAvailable())
+  if (!gpu_data_manager_->IsEssentialGpuInfoAvailable())
     return;
 
   gpu_observer_.Remove(gpu_data_manager_);
   MaybeFillFingerprint();
 }
 
 void FingerprintDataLoader::OnGotFonts(scoped_ptr<base::ListValue> fonts) {
   DCHECK(!fonts_);
   fonts_.reset(fonts.release());
   MaybeFillFingerprint();
@@ skipping 17 matching lines @@
   geolocation_subscription_.reset();
 
   MaybeFillFingerprint();
 }
 
 void FingerprintDataLoader::MaybeFillFingerprint() {
   // If all of the data has been loaded, or if the |timeout_timer_| has expired,
   // fill the fingerprint and clean up.
   if (!timeout_timer_.IsRunning() ||
       ((!gpu_data_manager_->GpuAccessAllowed(NULL) ||
-        gpu_data_manager_->IsCompleteGpuInfoAvailable()) &&
+        gpu_data_manager_->IsEssentialGpuInfoAvailable()) &&
        fonts_ &&
        !waiting_on_plugins_ &&
        (geoposition_.Validate() ||
         geoposition_.error_code != content::Geoposition::ERROR_CODE_NONE))) {
     FillFingerprint();
     delete this;
   }
 }
 
 void FingerprintDataLoader::FillFingerprint() {
@@ skipping 12 matching lines @@
   machine->set_ram(base::SysInfo::AmountOfPhysicalMemory());
   machine->set_browser_build(version_);
   machine->set_browser_feature(
       Fingerprint::MachineCharacteristics::FEATURE_REQUEST_AUTOCOMPLETE);
   if (fonts_)
     AddFontsToFingerprint(*fonts_, machine);
   AddPluginsToFingerprint(plugins_, machine);
   AddAcceptLanguagesToFingerprint(accept_languages_, machine);
   AddScreenInfoToFingerprint(screen_info_, machine);
   AddCpuInfoToFingerprint(machine);
-  AddGpuInfoToFingerprint(machine);
+  AddGpuInfoToFingerprint(machine, *gpu_data_manager_);
 
   // TODO(isherman): Record the user_and_device_name_hash.
   // TODO(isherman): Record the partition size of the hard drives?
 
   Fingerprint::TransientState* transient_state =
       fingerprint->mutable_transient_state();
   Fingerprint::Dimension* inner_window_size =
       transient_state->mutable_inner_window_size();
   inner_window_size->set_width(content_bounds_.width());
   inner_window_size->set_height(content_bounds_.height());
@@ skipping 74 matching lines @@
     host_view->GetRenderWidgetHost()->GetWebScreenInfo(&screen_info);
 
   internal::GetFingerprintInternal(
       obfuscated_gaia_id, window_bounds, content_bounds, screen_info, version,
       charset, accept_languages, install_time, app_locale, user_agent,
       base::TimeDelta::FromSeconds(kTimeoutSeconds), callback);
 }
 
 }  // namespace risk
 }  // namespace autofill