Move branding information out of google_util

chrome/browser/google/google_util.h

Index: chrome/browser/google/google_util.h
diff --git a/chrome/browser/google/google_util.h b/chrome/browser/google/google_util.h
index d116e05b2eab8cfbaa274ecd3d2198dfb0228abc..a8cc238c6bb2dc3434ba18e1f524189499117565 100644
--- a/chrome/browser/google/google_util.h
+++ b/chrome/browser/google/google_util.h
@@ -13,8 +13,7 @@
 
 class GURL;
 
-// This namespace provides various helpers around handling Google-related URLs
-// and state relating to Google Chrome distributions (such as RLZ).
+// This namespace provides various helpers around handling Google-related URLs.
 namespace google_util {
 
 // True iff |str| contains a "q=" query parameter with a non-empty value.
@@ -45,15 +44,6 @@ std::string GetGoogleCountryCode(GURL google_homepage_url);
 // Returns the Google search URL for the given Google homepage URL.
 GURL GetGoogleSearchURL(GURL google_homepage_url);
 
-// Returns in |brand| the brand code or distribution tag that has been
-// assigned to a partner. Returns false if the information is not available.
-bool GetBrand(std::string* brand);
-
-// Returns in |brand| the reactivation brand code or distribution tag
-// that has been assigned to a partner for reactivating a dormant chrome
-// install. Returns false if the information is not available.
-bool GetReactivationBrand(std::string* brand);
-
 // Returns the Google base URL specified on the command line, if it exists.
 // This performs some fixup and sanity-checking to ensure that the resulting URL
 // is valid and has no query or ref.
@@ -113,29 +103,6 @@ bool IsGoogleHomePageUrl(const GURL& url);
 // True if |url| represents a valid Google search URL.
 bool IsGoogleSearchUrl(const GURL& url);
 
-// True if a build is strictly organic, according to its brand code.
-bool IsOrganic(const std::string& brand);
-
-// True if a build should run as organic during first run. This uses
-// a slightly different set of brand codes from the standard IsOrganic
-// method.
-bool IsOrganicFirstRun(const std::string& brand);
-
-// True if |brand| is an internet cafe brand code.
-bool IsInternetCafeBrandCode(const std::string& brand);
-
-// This class is meant to be used only from test code, and sets the brand
-// code returned by the function GetBrand() above while the object exists.
-class BrandForTesting {
- public:
-  explicit BrandForTesting(const std::string& brand);
-  ~BrandForTesting();
-
- private:
-  std::string brand_;
-  DISALLOW_COPY_AND_ASSIGN(BrandForTesting);
-};
-
 }  // namespace google_util
 
 #endif  // CHROME_BROWSER_GOOGLE_GOOGLE_UTIL_H__