Move branding information out of google_util

chrome/browser/google/google_util.h

 // 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.
 //
 // Some Google related utility functions.
 
 #ifndef CHROME_BROWSER_GOOGLE_GOOGLE_UTIL_H__
 #define CHROME_BROWSER_GOOGLE_GOOGLE_UTIL_H__
 
 #include <string>
 
 #include "base/basictypes.h"
 
 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.
 // |str| should be a query or a hash fragment, without the ? or # (as
 // returned by GURL::query() or GURL::ref().
 bool HasGoogleSearchQueryParam(const std::string& str);
 
 // The query key that identifies a Google Extended API request for Instant.
 const char kInstantExtendedAPIParam[] = "espv";
 
@@ skipping 10 matching lines @@
 
 // String version of AppendGoogleLocaleParam.
 std::string StringAppendGoogleLocaleParam(const std::string& url);
 
 // Returns the Google country code string for the given Google homepage URL.
 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.
 GURL CommandLineGoogleBaseURL();
 
 // Returns true if a Google base URL was specified on the command line and |url|
 // begins with that base URL.  This uses a simple string equality check.
 bool StartsWithCommandLineGoogleBaseURL(const GURL& url);
 
 // WARNING: The following IsGoogleXXX() functions use heuristics to rule out
@@ skipping 39 matching lines @@
 bool IsGoogleDomainUrl(const GURL& url,
                        SubdomainPermission subdomain_permission,
                        PortPermission port_permission);
 
 // True if |url| represents a valid Google home page URL.
 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__