Move branding information out of google_util

chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc

 // Copyright 2013 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 "chrome/browser/profile_resetter/automatic_profile_resetter_delegate.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/values_test_util.h"
 #include "base/values.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service_unittest.h"
+#include "chrome/browser/google/google_brand.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profile_resetter/brandcoded_default_settings.h"
 #include "chrome/browser/profile_resetter/profile_reset_global_error.h"
 #include "chrome/browser/search_engines/default_search_manager.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/search_engines/template_url_service_test_util.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
@@ skipping 400 matching lines @@
     PrefService* prefs = profile()->GetPrefs();
     ASSERT_TRUE(prefs);
     const base::DictionaryValue* expected_dsp_details =
         GetDefaultSearchProviderDetailsFromPrefs(prefs);
     ExpectDetailsMatch(*expected_dsp_details, *details);
   }
 }
 
 TEST_F(AutomaticProfileResetterDelegateTest,
        FetchAndWaitOnDefaultSettingsVanilla) {
-  google_util::BrandForTesting scoped_brand_for_testing((std::string()));
+  google_brand::BrandForTesting scoped_brand_for_testing((std::string()));
 
   // Expect ready_callback to be called just after empty brandcoded settings
   // are loaded, given this is a vanilla build. Fail if it is not called, or
   // called too early.
   testing::StrictMock<MockCallbackTarget> mock_target;
   resetter_delegate()->RequestCallbackWhenBrandcodedDefaultsAreFetched(
       mock_target.CreateClosure());
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(resetter_delegate()->brandcoded_defaults());
 
@@ skipping 11 matching lines @@
   resetter_delegate()->RequestCallbackWhenBrandcodedDefaultsAreFetched(
       mock_target.CreateClosure());
   base::RunLoop().RunUntilIdle();
 
   // No test for a new instance of AutomaticProfileResetterDelegate. That will
   // need to fetch the brandcoded settings again.
 }
 
 TEST_F(AutomaticProfileResetterDelegateTest,
        FetchAndWaitOnDefaultSettingsBranded) {
-  google_util::BrandForTesting scoped_brand_for_testing(kTestBrandcode);
+  google_brand::BrandForTesting scoped_brand_for_testing(kTestBrandcode);
 
   // Expect ready_callback to be called just after the brandcoded settings are
   // downloaded. Fail if it is not called, or called too early.
   testing::StrictMock<MockCallbackTarget> mock_target;
   resetter_delegate()->RequestCallbackWhenBrandcodedDefaultsAreFetched(
       mock_target.CreateClosure());
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(resetter_delegate()->brandcoded_defaults());
 
   EXPECT_CALL(mock_target, Run());
@@ skipping 12 matching lines @@
   // Expect ready_callback to be posted immediately when the brandcoded settings
   // have already been downloaded.
   EXPECT_CALL(mock_target, Run());
   resetter_delegate()->RequestCallbackWhenBrandcodedDefaultsAreFetched(
       mock_target.CreateClosure());
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(AutomaticProfileResetterDelegateTest,
        FetchAndWaitOnDefaultSettingsBrandedFailure) {
-  google_util::BrandForTesting scoped_brand_for_testing(kTestBrandcode);
+  google_brand::BrandForTesting scoped_brand_for_testing(kTestBrandcode);
 
   // Expect ready_callback to be called just after the brandcoded settings have
   // failed to download. Fail if it is not called, or called too early.
   testing::StrictMock<MockCallbackTarget> mock_target;
   resetter_delegate()->RequestCallbackWhenBrandcodedDefaultsAreFetched(
       mock_target.CreateClosure());
   base::RunLoop().RunUntilIdle();
 
   EXPECT_CALL(mock_target, Run());
   resetter_delegate()->FetchBrandcodedDefaultSettingsIfNeeded();
   ExpectAndServicePendingBrandcodedConfigFetch(true /*simulate_failure*/);
   base::RunLoop().RunUntilIdle();
 
   testing::Mock::VerifyAndClearExpectations(&mock_target);
   EXPECT_TRUE(resetter_delegate()->brandcoded_defaults());
 
   // Expect ready_callback to be posted immediately when the brandcoded settings
   // have already been attempted to be downloaded, but failed.
   EXPECT_CALL(mock_target, Run());
   resetter_delegate()->RequestCallbackWhenBrandcodedDefaultsAreFetched(
       mock_target.CreateClosure());
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(AutomaticProfileResetterDelegateTest, TriggerReset) {
-  google_util::BrandForTesting scoped_brand_for_testing(kTestBrandcode);
+  google_brand::BrandForTesting scoped_brand_for_testing(kTestBrandcode);
 
   PrefService* prefs = profile()->GetPrefs();
   DCHECK(prefs);
   prefs->SetString(prefs::kHomePage, kTestHomepage);
 
   testing::StrictMock<MockCallbackTarget> mock_target;
   EXPECT_CALL(mock_target, Run());
   EXPECT_CALL(*resetter_delegate(), SendFeedback(testing::_)).Times(0);
   resetter_delegate()->TriggerProfileSettingsReset(
       false /*send_feedback*/, mock_target.CreateClosure());
   ExpectAndServicePendingBrandcodedConfigFetch(false /*simulate_failure*/);
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(kTestBrandedHomepage, prefs->GetString(prefs::kHomePage));
 }
 
 TEST_F(AutomaticProfileResetterDelegateTest,
        TriggerResetWithDefaultSettingsAlreadyLoaded) {
-  google_util::BrandForTesting scoped_brand_for_testing(kTestBrandcode);
+  google_brand::BrandForTesting scoped_brand_for_testing(kTestBrandcode);
 
   PrefService* prefs = profile()->GetPrefs();
   DCHECK(prefs);
   prefs->SetString(prefs::kHomePage, kTestHomepage);
 
   resetter_delegate()->FetchBrandcodedDefaultSettingsIfNeeded();
   ExpectAndServicePendingBrandcodedConfigFetch(false /*simulate_failure*/);
   base::RunLoop().RunUntilIdle();
 
   testing::StrictMock<MockCallbackTarget> mock_target;
   EXPECT_CALL(mock_target, Run());
   EXPECT_CALL(*resetter_delegate(), SendFeedback(testing::_)).Times(0);
   resetter_delegate()->TriggerProfileSettingsReset(
       false /*send_feedback*/, mock_target.CreateClosure());
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(kTestBrandedHomepage, prefs->GetString(prefs::kHomePage));
 }
 
 TEST_F(AutomaticProfileResetterDelegateTest,
        TriggerResetAndSendFeedback) {
-  google_util::BrandForTesting scoped_brand_for_testing(kTestBrandcode);
+  google_brand::BrandForTesting scoped_brand_for_testing(kTestBrandcode);
 
   PrefService* prefs = profile()->GetPrefs();
   DCHECK(prefs);
   prefs->SetString(prefs::kHomePage, kTestHomepage);
 
   testing::StrictMock<MockCallbackTarget> mock_target;
   EXPECT_CALL(mock_target, Run());
   EXPECT_CALL(*resetter_delegate(),
               SendFeedback(testing::HasSubstr(kTestHomepage)));
 
   resetter_delegate()->TriggerProfileSettingsReset(
       true /*send_feedback*/, mock_target.CreateClosure());
   ExpectAndServicePendingBrandcodedConfigFetch(false /*simulate_failure*/);
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(AutomaticProfileResetterDelegateTest, ShowAndDismissPrompt) {
   resetter_delegate()->TriggerPrompt();
   if (ProfileResetGlobalError::IsSupportedOnPlatform())
     ExpectResetPromptState(true /*active*/);
   else
     ExpectResetPromptState(false /*active*/);
   resetter_delegate()->DismissPrompt();
   ExpectResetPromptState(false /*active*/);
   resetter_delegate()->DismissPrompt();
 }
 
 }  // namespace