Move branding information out of google_util

chrome/browser/google/google_update_settings_unittest.cc

 // 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.
 
 #include "base/basictypes.h"
 #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"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 class GoogleUpdateTest : public PlatformTest {
  protected:
   GoogleUpdateTest() : user_data_dir_override_(chrome::DIR_USER_DATA) {}
   virtual ~GoogleUpdateTest() {}
@@ skipping 25 matching lines @@
   // should give 0 days.
   EXPECT_TRUE(GoogleUpdateSettings::SetLastRunTime());
   EXPECT_EQ(0, GoogleUpdateSettings::GetLastRunTime());
 }
 
 #endif  // defined(OS_WIN)
 
 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
 }