Move branding information out of google_util

chrome/browser/google/google_brand.h

Index: chrome/browser/google/google_brand.h
diff --git a/chrome/browser/google/google_brand.h b/chrome/browser/google/google_brand.h
new file mode 100644
index 0000000000000000000000000000000000000000..79af1c75b2fcc8870917da58bca46c794b084e8a
--- /dev/null
+++ b/chrome/browser/google/google_brand.h
@@ -0,0 +1,54 @@
+// Copyright 2014 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.

[Peter Kasting, 2014/06/04 20:32:16]

Can you clarify and expand this comment?  This is no longer just random
utilities, they all have to do with branding.  Maybe explain a bit about what a
brand is and who might care?

[blundell, 2014/06/05 09:21:43]

Done.

+
+#ifndef CHROME_BROWSER_GOOGLE_GOOGLE_BRAND_H__
+#define CHROME_BROWSER_GOOGLE_GOOGLE_BRAND_H__
+
+#include <string>
+
+#include "base/basictypes.h"
+
+class GURL;
+
+// This namespace provides various helpers and state relating to Google Chrome
+// distributions (such as RLZ).

[Peter Kasting, 2014/06/04 20:32:16]

Nit: I'd drop this and say anything necessary in the file comment above.

[blundell, 2014/06/05 09:21:43]

Done.

+namespace google_brand {
+
+// 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);
+
+// 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_brand
+
+#endif  // CHROME_BROWSER_GOOGLE_GOOGLE_BRAND_H__