Revert "Componentize chrome/browser/rlz"

chrome/browser/search_engines/ui_thread_search_terms_data.cc

Index: chrome/browser/search_engines/ui_thread_search_terms_data.cc
diff --git a/chrome/browser/search_engines/ui_thread_search_terms_data.cc b/chrome/browser/search_engines/ui_thread_search_terms_data.cc
index 11dae124659c5a24a354bb21f02eb30c6d72881c..1ccd09aac8b7e23c873fb9355b105ac549cc0acc 100644
--- a/chrome/browser/search_engines/ui_thread_search_terms_data.cc
+++ b/chrome/browser/search_engines/ui_thread_search_terms_data.cc
@@ -28,7 +28,7 @@
 #include "url/gurl.h"
 
 #if defined(ENABLE_RLZ)
-#include "components/rlz/rlz_tracker.h"
+#include "chrome/browser/rlz/rlz.h"
 #endif
 
 using content::BrowserThread;
@@ -82,12 +82,12 @@ base::string16 UIThreadSearchTermsData::GetRlzParameterValue(
     // 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;