Move branding information out of google_util

chrome/browser/rlz/rlz_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 "chrome/browser/rlz/rlz.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/google/google_brand.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/omnibox/omnibox_log.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "rlz/test/rlz_test_helpers.h"
@@ skipping 152 matching lines @@
   void SimulateHomepageUsage();
   void SimulateAppListUsage();
   void InvokeDelayedInit();
 
   void ExpectEventRecorded(const char* event_name, bool expected);
   void ExpectRlzPingSent(bool expected);
   void ExpectReactivationRlzPingSent(bool expected);
 
   TestRLZTracker tracker_;
 #if defined(OS_POSIX)
-  scoped_ptr<google_util::BrandForTesting> brand_override_;
+  scoped_ptr<google_brand::BrandForTesting> brand_override_;
 #endif
 };
 
 void RlzLibTest::SetUp() {
   RlzLibTestNoMachineState::SetUp();
 
   // Make sure a non-organic brand code is set in the registry or the RLZTracker
   // is pretty much a no-op.
   SetMainBrand("TEST");
   SetReactivationBrand("");
 }
 
 void RlzLibTest::SetMainBrand(const char* brand) {
 #if defined(OS_WIN)
   SetRegistryBrandValue(google_update::kRegRLZBrandField, brand);
 #elif defined(OS_POSIX)
-  brand_override_.reset(new google_util::BrandForTesting(brand));
+  brand_override_.reset(new google_brand::BrandForTesting(brand));
 #endif
   std::string check_brand;
-  google_util::GetBrand(&check_brand);
+  google_brand::GetBrand(&check_brand);
   EXPECT_EQ(brand, check_brand);
 }
 
 void RlzLibTest::SetReactivationBrand(const char* brand) {
   // TODO(thakis): Reactivation doesn't exist on Mac yet.
 #if defined(OS_WIN)
   SetRegistryBrandValue(google_update::kRegRLZReactivationBrandField, brand);
   std::string check_brand;
-  google_util::GetReactivationBrand(&check_brand);
+  google_brand::GetReactivationBrand(&check_brand);
   EXPECT_EQ(brand, check_brand);
 #endif
 }
 
 #if defined(OS_WIN)
 void RlzLibTest::SetRegistryBrandValue(const wchar_t* name,
                                        const char* brand) {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   base::string16 reg_path = dist->GetStateKey();
   RegKey key(HKEY_CURRENT_USER, reg_path.c_str(), KEY_SET_VALUE);
@@ skipping 46 matching lines @@
   GetProductEventsAsCgi(rlz_lib::CHROME, cgi, arraysize(cgi));
   if (expected) {
     EXPECT_STR_CONTAINS(cgi, event_name);
   } else {
     EXPECT_STR_NOT_CONTAIN(cgi, event_name);
   }
 }
 
 void RlzLibTest::ExpectRlzPingSent(bool expected) {
   std::string brand;
-  google_util::GetBrand(&brand);
+  google_brand::GetBrand(&brand);
   EXPECT_EQ(expected, tracker_.was_ping_sent_for_brand(brand.c_str()));
 }
 
 void RlzLibTest::ExpectReactivationRlzPingSent(bool expected) {
   std::string brand;
-  google_util::GetReactivationBrand(&brand);
+  google_brand::GetReactivationBrand(&brand);
   EXPECT_EQ(expected, tracker_.was_ping_sent_for_brand(brand.c_str()));
 }
 
 // The events that affect the different RLZ scenarios are the following:
 //
 //  A: the user starts chrome for the first time
 //  B: the user stops chrome
 //  C: the user start a subsequent time
 //  D: the user stops chrome again
 //  I: the RLZTracker::DelayedInit() method is invoked
@@ skipping 589 matching lines @@
   RLZTracker::RecordProductEvent(rlz_lib::CHROME, RLZTracker::ChromeOmnibox(),
                                  rlz_lib::FIRST_SEARCH);
 
   ExpectEventRecorded(kOmniboxFirstSearch, true);
 
   RLZTracker::ClearRlzState();
 
   ExpectEventRecorded(kOmniboxFirstSearch, false);
 }
 #endif  // defined(OS_CHROMEOS)