Revert "Componentize chrome/browser/rlz"

chrome/browser/search_engines/ui_thread_search_terms_data.cc

 // Copyright 2014 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/ui_thread_search_terms_data.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
@@ skipping 10 matching lines @@
 #include "chrome/common/chrome_version_info.h"
 #include "components/google/core/browser/google_url_tracker.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/omnibox/browser/omnibox_field_trial.h"
 #include "components/search/search.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/device_form_factor.h"
 #include "url/gurl.h"
 
 #if defined(ENABLE_RLZ)
-#include "components/rlz/rlz_tracker.h"
+#include "chrome/browser/rlz/rlz.h"
 #endif
 
 using content::BrowserThread;
 
 // static
 std::string* UIThreadSearchTermsData::google_base_url_ = NULL;
 
 UIThreadSearchTermsData::UIThreadSearchTermsData(Profile* profile)
     : profile_(profile) {
   DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
@@ skipping 33 matching lines @@
   base::string16 rlz_string;
 #if defined(ENABLE_RLZ)
   // For organic brandcodes do not use rlz at all. Empty brandcode usually
   // means a chromium install. This is ok.
   std::string brand;
   if (google_brand::GetBrand(&brand) && !brand.empty() &&
       !google_brand::IsOrganic(brand)) {
     // This call will return false the first time(s) it is called until the
     // value has been cached. This normally would mean that at most one omnibox
     // search might not send the RLZ data but this is not really a problem.
-    rlz_lib::AccessPoint access_point = rlz::RLZTracker::ChromeOmnibox();
+    rlz_lib::AccessPoint access_point = RLZTracker::ChromeOmnibox();
 #if !defined(OS_IOS)
     if (from_app_list)
-      access_point = rlz::RLZTracker::ChromeAppList();
+      access_point = RLZTracker::ChromeAppList();
 #endif
-    rlz::RLZTracker::GetAccessPointRlz(access_point, &rlz_string);
+    RLZTracker::GetAccessPointRlz(access_point, &rlz_string);
   }
 #endif
   return rlz_string;
 }
 
 // We can enable this on non-Android if other platforms ever want a non-empty
 // search client string.  There is already a unit test in place for Android
 // called TemplateURLTest::SearchClient.
 std::string UIThreadSearchTermsData::GetSearchClient() const {
   DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
@@ skipping 85 matching lines @@
   if (!modifier.empty())
     version += " " + modifier;
   return version;
 }
 
 // static
 void UIThreadSearchTermsData::SetGoogleBaseURL(const std::string& base_url) {
   delete google_base_url_;
   google_base_url_ = base_url.empty() ? NULL : new std::string(base_url);
 }