Move GPU preliminary info collection back to UI thread.

chrome/browser/web_resource/gpu_blacklist_updater.cc

 // Copyright (c) 2011 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/web_resource/gpu_blacklist_updater.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/values.h"
@@ skipping 18 matching lines @@
 
 namespace {
 
 // Delay on first fetch so we don't interfere with startup.
 static const int kStartGpuBlacklistFetchDelay = 6000;
 
 // Delay between calls to update the gpu blacklist (48 hours).
 static const int kCacheUpdateDelay = 48 * 60 * 60 * 1000;
 
 std::string GetChromeVersionString() {
-  CR_DEFINE_STATIC_LOCAL(std::string, cr_version, ());
-  if (!cr_version.empty())
-    return cr_version;
   chrome::VersionInfo version_info;
-  cr_version =  version_info.is_valid() ? version_info.Version() : "0";
-  switch (version_info.GetChannel()) {
-    case chrome::VersionInfo::CHANNEL_STABLE:
-      cr_version += " stable";
-      break;
-    case chrome::VersionInfo::CHANNEL_BETA:
-      cr_version += " beta";
-      break;
-    case chrome::VersionInfo::CHANNEL_DEV:
-      cr_version += " dev";
-      break;
-    case chrome::VersionInfo::CHANNEL_CANARY:
-      cr_version += " canary";
-      break;
-    default:
-      cr_version += " unknown";
-      break;
-  }
-  return cr_version;
+  return version_info.is_valid() ? version_info.Version() : "0";
 }
 
 }  // namespace anonymous
 
 const char* GpuBlacklistUpdater::kDefaultGpuBlacklistURL =
     "https://ssl.gstatic.com/chrome/config/software_rendering_list.json";
 
 GpuBlacklistUpdater::GpuBlacklistUpdater()
     : WebResourceService(g_browser_process->local_state(),
                          GpuBlacklistUpdater::kDefaultGpuBlacklistURL,
                          false,  // don't append locale to URL
                          chrome::NOTIFICATION_CHROME_END,
                          prefs::kGpuBlacklistUpdate,
                          kStartGpuBlacklistFetchDelay,
                          kCacheUpdateDelay) {
   prefs_->RegisterDictionaryPref(prefs::kGpuBlacklist);
   InitializeGpuBlacklist();
 }
 
 GpuBlacklistUpdater::~GpuBlacklistUpdater() { }
 
 // static
-void GpuBlacklistUpdater::SetupOnFileThread() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+void GpuBlacklistUpdater::Setup() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Initialize GpuDataManager instance, which collects preliminary
-  // graphics information.  This has to happen on FILE thread.
+  // graphics information.
   GpuDataManager::GetInstance();
 
-  // Cache the chrome version string.  This has to happen on FILE thread
-  // because of chrome::VersionInfo::GetChannel().
-  GetChromeVersionString();
-
   // Skip auto updates in tests.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kSkipGpuDataLoading))
     return;
 
-  // Post GpuBlacklistUpdate task on UI thread.  This has to happen
-  // after GpuDataManager is initialized, otherwise it might be
-  // initialzed on UI thread.
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(&GpuBlacklistUpdater::SetupOnUIThread));
-}
-
-// static
-void GpuBlacklistUpdater::SetupOnUIThread() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
   // Initialize GpuBlacklistUpdater, which loads the current blacklist;
   // then Schedule a GPU blacklist auto update.
   GpuBlacklistUpdater* updater =
       g_browser_process->gpu_blacklist_updater();
   DCHECK(updater);
 }
 
 void GpuBlacklistUpdater::Unpack(const DictionaryValue& parsed_json) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   prefs_->Set(prefs::kGpuBlacklist, parsed_json);
@@ skipping 26 matching lines @@
 
   scoped_ptr<GpuBlacklist> gpu_blacklist(
       new GpuBlacklist(GetChromeVersionString()));
   bool success = gpu_blacklist->LoadGpuBlacklist(
       gpu_blacklist_cache, GpuBlacklist::kCurrentOsOnly);
   if (success) {
     GpuDataManager::GetInstance()->UpdateGpuBlacklist(
         gpu_blacklist.release(), preliminary);
   }
 }