Move branding information out of google_util

chrome/browser/google/google_update_settings_unittest.cc

Index: chrome/browser/google/google_update_settings_unittest.cc
diff --git a/chrome/browser/google/google_update_settings_unittest.cc b/chrome/browser/google/google_update_settings_unittest.cc
index 1bdc68af34e64c7ed2c17ef7ceaaba434f1e2897..214cdf2c68e00ace23c8ce918e01b99ad0d55205 100644
--- a/chrome/browser/google/google_update_settings_unittest.cc
+++ b/chrome/browser/google/google_update_settings_unittest.cc
@@ -6,6 +6,7 @@
 #include "base/compiler_specific.h"
 #include "base/path_service.h"
 #include "base/test/scoped_path_override.h"
+#include "chrome/browser/google/google_brand.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/installer/util/google_update_settings.h"
@@ -51,14 +52,14 @@ TEST_F(GoogleUpdateTest, LastRunTime) {
 TEST_F(GoogleUpdateTest, IsOrganicFirstRunBrandCodes) {
   // Test some brand codes to ensure that future changes to this method won't
   // go unnoticed.
-  EXPECT_FALSE(google_util::IsOrganicFirstRun("CHFO"));
-  EXPECT_FALSE(google_util::IsOrganicFirstRun("CHMA"));
-  EXPECT_TRUE(google_util::IsOrganicFirstRun("EUBA"));
-  EXPECT_TRUE(google_util::IsOrganicFirstRun("GGRA"));
+  EXPECT_FALSE(google_brand::IsOrganicFirstRun("CHFO"));
+  EXPECT_FALSE(google_brand::IsOrganicFirstRun("CHMA"));
+  EXPECT_TRUE(google_brand::IsOrganicFirstRun("EUBA"));
+  EXPECT_TRUE(google_brand::IsOrganicFirstRun("GGRA"));
 
 #if defined(OS_MACOSX)
   // An empty brand string on Mac is used for channels other than stable,
   // which are always organic.
-  EXPECT_TRUE(google_util::IsOrganicFirstRun(""));
+  EXPECT_TRUE(google_brand::IsOrganicFirstRun(""));
 #endif
 }