Revert "Componentize chrome/browser/rlz"

chrome/browser/browser_shutdown.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/browser_shutdown.h"
 
 #include <map>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 22 matching lines @@
 #include "components/metrics/metrics_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/browser_util_win.h"
 #include "chrome/browser/first_run/upgrade_util_win.h"
 #endif
 
 #if defined(ENABLE_RLZ)
-#include "components/rlz/rlz_tracker.h"
+#include "chrome/browser/rlz/rlz.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_recorder.h"
 #endif
 
 #if defined(ENABLE_PRINT_PREVIEW)
 #include "chrome/browser/service_process/service_process_control.h"
 #endif
 
@@ skipping 131 matching lines @@
       }
     }
 #endif
   }
 
   prefs->CommitPendingWrite();
 
 #if defined(ENABLE_RLZ)
   // Cleanup any statics created by RLZ. Must be done before NotificationService
   // is destroyed.
-  rlz::RLZTracker::CleanupRlz();
+  RLZTracker::CleanupRlz();
 #endif
 
   return restart_last_session;
 }
 
 void ShutdownPostThreadsStop(bool restart_last_session) {
   delete g_browser_process;
   g_browser_process = NULL;
 
   // crbug.com/95079 - This needs to happen after the browser process object
@@ skipping 132 matching lines @@
 
 void SetTryingToQuit(bool quitting) {
   g_trying_to_quit = quitting;
 }
 
 bool IsTryingToQuit() {
   return g_trying_to_quit;
 }
 
 }  // namespace browser_shutdown