Move branding information out of google_util

chrome/browser/search_engines/template_url_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/base_paths.h"
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(ENABLE_RLZ)
+#include "chrome/browser/google/google_brand.h"
 #include "chrome/browser/google/google_util.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/search_engines/search_terms_data_android.h"
 #endif
 
 using base::ASCIIToUTF16;
 
 // TestSearchTermsData --------------------------------------------------------
@@ skipping 622 matching lines @@
     GURL result(url.url_ref().ReplaceSearchTerms(search_terms_args));
     ASSERT_TRUE(result.is_valid());
     EXPECT_EQ(test_data[i].expected_result, result.spec());
   }
 }
 
 TEST_F(TemplateURLTest, RLZ) {
   base::string16 rlz_string;
 #if defined(ENABLE_RLZ)
   std::string brand;
-  if (google_util::GetBrand(&brand) && !brand.empty() &&
-      !google_util::IsOrganic(brand)) {
+  if (google_brand::GetBrand(&brand) && !brand.empty() &&
+      !google_brand::IsOrganic(brand)) {
     RLZTracker::GetAccessPointRlz(RLZTracker::ChromeOmnibox(), &rlz_string);
   }
 #elif defined(OS_ANDROID)
   SearchTermsDataAndroid::rlz_parameter_value_.Get() =
       ASCIIToUTF16("android_test");
   rlz_string = SearchTermsDataAndroid::rlz_parameter_value_.Get();
 #endif
 
   TemplateURLData data;
   data.SetURL("http://bar/?{google:RLZ}{searchTerms}");
   TemplateURL url(NULL, data);
   EXPECT_TRUE(url.url_ref().IsValid());
   ASSERT_TRUE(url.url_ref().SupportsReplacement());
   GURL result(url.url_ref().ReplaceSearchTerms(
       TemplateURLRef::SearchTermsArgs(ASCIIToUTF16("x"))));
   ASSERT_TRUE(result.is_valid());
   std::string expected_url = "http://bar/?";
   if (!rlz_string.empty())
     expected_url += "rlz=" + base::UTF16ToUTF8(rlz_string) + "&";
   expected_url += "x";
   EXPECT_EQ(expected_url, result.spec());
 }
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 TEST_F(TemplateURLTest, RLZFromAppList) {
   base::string16 rlz_string;
 #if defined(ENABLE_RLZ)
   std::string brand;
-  if (google_util::GetBrand(&brand) && !brand.empty() &&
-      !google_util::IsOrganic(brand)) {
+  if (google_brand::GetBrand(&brand) && !brand.empty() &&
+      !google_brand::IsOrganic(brand)) {
     RLZTracker::GetAccessPointRlz(RLZTracker::ChromeAppList(), &rlz_string);
   }
 #endif
 
   TemplateURLData data;
   data.SetURL("http://bar/?{google:RLZ}{searchTerms}");
   TemplateURL url(NULL, data);
   EXPECT_TRUE(url.url_ref().IsValid());
   ASSERT_TRUE(url.url_ref().SupportsReplacement());
   TemplateURLRef::SearchTermsArgs args(ASCIIToUTF16("x"));
@@ skipping 648 matching lines @@
   TemplateURLRef::SearchTermsArgs search_terms_args(ASCIIToUTF16("foo"));
   search_terms_args.session_token = "SESSIONTOKENGOESHERE";
   std::string result = url.url_ref().ReplaceSearchTerms(search_terms_args);
   EXPECT_EQ("http://bar/search?q=foo&psi=SESSIONTOKENGOESHERE&xssi=t", result);
 
   TemplateURL url2(NULL, data);
   search_terms_args.session_token = "";
   result = url.url_ref().ReplaceSearchTerms(search_terms_args);
   EXPECT_EQ("http://bar/search?q=foo&xssi=t", result);
 }