Move branding information out of google_util

chrome/browser/search_engines/template_url_unittest.cc

Index: chrome/browser/search_engines/template_url_unittest.cc
diff --git a/chrome/browser/search_engines/template_url_unittest.cc b/chrome/browser/search_engines/template_url_unittest.cc
index 626b5eb2aabe7fcb3b2ed1604cf20c994098464b..41b21353f3fbdadde5e096721409f68911773f47 100644
--- a/chrome/browser/search_engines/template_url_unittest.cc
+++ b/chrome/browser/search_engines/template_url_unittest.cc
@@ -16,6 +16,7 @@
 #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
 
@@ -658,8 +659,8 @@ 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)
@@ -688,8 +689,8 @@ 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