Revert "Componentize chrome/browser/rlz"

chrome/browser/chromeos/login/login_utils_browsertest.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 <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #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"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/chromeos_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/gaia/fake_gaia.h"
 #include "google_apis/gaia/gaia_switches.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #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 {
 
 #if defined(ENABLE_RLZ)
 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
 
 }  // namespace
 
 class LoginUtilsTest : public OobeBaseTest,
                        public testing::WithParamInterface<bool> {
  public:
   LoginUtilsTest() { set_use_webview(GetParam()); }
 
@@ skipping 48 matching lines @@
   // RLZ brand code has been set to empty string.
   EXPECT_TRUE(local_state()->HasPrefPath(prefs::kRLZBrand));
   EXPECT_EQ(std::string(), local_state()->GetString(prefs::kRLZBrand));
 
   // RLZ value for homepage access point should have been initialized.
   // This value must be obtained in a background thread.
   {
     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);
   }
 }
 
 INSTANTIATE_TEST_CASE_P(LoginUtilsTestSuite, LoginUtilsTest, testing::Bool());
 
 #endif
 
 }  // namespace chromeos