Move branding information out of google_util

chrome/browser/search_engines/template_url_service_test_util.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 "chrome/browser/search_engines/template_url_service_test_util.h"
 
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/search_engines/default_search_manager.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/google/google_util_chromeos.h"
+#include "chrome/browser/google/google_brand_chromeos.h"
 #endif
 
 // Trivial subclass of TemplateURLService that records the last invocation of
 // SetKeywordSearchTermsForURL.
 class TestingTemplateURLService : public TemplateURLService {
  public:
   static KeyedService* Build(content::BrowserContext* profile) {
     return new TestingTemplateURLService(static_cast<Profile*>(profile));
   }
 
@@ skipping 174 matching lines @@
 }
 
 void TemplateURLServiceTestUtil::SetUp() {
   // Make unique temp directory.
   ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   profile_.reset(new TestingProfile(temp_dir_.path()));
 
   TemplateURLServiceTestUtilBase::CreateTemplateUrlService();
 
 #if defined(OS_CHROMEOS)
-  google_util::chromeos::ClearBrandForCurrentSession();
+  google_brand::chromeos::ClearBrandForCurrentSession();
 #endif
 }
 
 void TemplateURLServiceTestUtil::TearDown() {
   profile_.reset();
 
   UIThreadSearchTermsData::SetGoogleBaseURL(std::string());
 
   // Flush the message loop to make application verifiers happy.
   base::RunLoop().RunUntilIdle();
 }
 
 TestingProfile* TemplateURLServiceTestUtil::profile() const {
   return profile_.get();
 }