Revert "Componentize chrome/browser/rlz"

chrome/browser/chromeos/login/login_utils_browsertest.cc

Index: chrome/browser/chromeos/login/login_utils_browsertest.cc
diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc
index 53ca4232f8afeb4759a5838a711961202f2df46b..6025228450af02bd732e49a46f6a693b946f9468 100644
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
+#include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ -28,10 +29,6 @@
 #include "net/test/embedded_test_server/http_response.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(ENABLE_RLZ)
-#include "components/rlz/rlz_tracker.h"
-#endif
-
 namespace chromeos {
 
 namespace {
@@ -40,7 +37,7 @@ namespace {
 void GetAccessPointRlzInBackgroundThread(rlz_lib::AccessPoint point,
                                          base::string16* rlz) {
   ASSERT_FALSE(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  ASSERT_TRUE(rlz::RLZTracker::GetAccessPointRlz(point, rlz));
+  ASSERT_TRUE(RLZTracker::GetAccessPointRlz(point, rlz));
 }
 #endif
 
@@ -109,8 +106,10 @@ IN_PROC_BROWSER_TEST_P(LoginUtilsTest, RlzInitialized) {
     base::RunLoop loop;
     base::string16 rlz_string;
     content::BrowserThread::PostBlockingPoolTaskAndReply(
-        FROM_HERE, base::Bind(&GetAccessPointRlzInBackgroundThread,
-                              rlz::RLZTracker::ChromeHomePage(), &rlz_string),
+        FROM_HERE,
+        base::Bind(&GetAccessPointRlzInBackgroundThread,
+                   RLZTracker::ChromeHomePage(),
+                   &rlz_string),
         loop.QuitClosure());
     loop.Run();
     EXPECT_EQ(base::string16(), rlz_string);