Move GPU preliminary info collection back to UI thread.

content/browser/gpu/gpu_blacklist.h

Index: content/browser/gpu/gpu_blacklist.h
===================================================================
--- content/browser/gpu/gpu_blacklist.h	(revision 111230)
+++ content/browser/gpu/gpu_blacklist.h	(working copy)
@@ -45,7 +45,7 @@
     kAllOs
   };
 
-  explicit GpuBlacklist(const std::string& browser_info_string);
+  explicit GpuBlacklist(const std::string& browser_version_string);
   ~GpuBlacklist();
 
   // Loads blacklist information from a json file.
@@ -110,14 +110,6 @@
     kMalformed
   };
 
-  enum BrowserChannel {
-    kStable,
-    kBeta,
-    kDev,
-    kCanary,
-    kUnknown
-  };
-
   class VersionInfo {
    public:
     VersionInfo(const std::string& version_op,
@@ -214,7 +206,6 @@
     // Determines if a given os/gc/driver is included in the Entry set.
     bool Contains(OsType os_type,
                   const Version& os_version,
-                  BrowserChannel channel,
                   const content::GPUInfo& gpu_info) const;
 
     // Returns the OsType.
@@ -286,8 +277,6 @@
 
     void AddException(ScopedGpuBlacklistEntry exception);
 
-    void AddBrowserChannel(BrowserChannel channel);
-
     uint32 id_;
     bool disabled_;
     std::string description_;
@@ -303,7 +292,6 @@
     scoped_ptr<StringInfo> gl_renderer_info_;
     scoped_ptr<GpuFeatureFlags> feature_flags_;
     std::vector<ScopedGpuBlacklistEntry> exceptions_;
-    std::vector<BrowserChannel> browser_channels_;
     bool contains_unknown_fields_;
     bool contains_unknown_features_;
   };
@@ -325,17 +313,12 @@
   // Check if any entries contain unknown fields.  This is only for tests.
   bool contains_unknown_fields() const { return contains_unknown_fields_; }
 
-  // The browser_info_string's format is "version channel".
-  // For example, "13.0.123.4 canary".
-  void SetBrowserInfo(const std::string& browser_info_string);
+  void SetBrowserVersion(const std::string& version_string);
 
-  static BrowserChannel StringToBrowserChannel(const std::string& value);
-
   scoped_ptr<Version> version_;
   std::vector<ScopedGpuBlacklistEntry> blacklist_;
 
   scoped_ptr<Version> browser_version_;
-  BrowserChannel browser_channel_;
 
   // This records all the blacklist entries that are appliable to the current
   // user machine.  It is updated everytime DetermineGpuFeatureFlags() is