Revert "Componentize chrome/browser/rlz"

chrome/browser/ui/app_list/app_list_controller_delegate.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/ui/app_list/app_list_controller_delegate.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/install_tracker_factory.h"
 #include "chrome/browser/extensions/launch_util.h"
@@ skipping 10 matching lines @@
 #include "extensions/common/manifest_handlers/options_page_info.h"
 #include "extensions/common/manifest_url_handlers.h"
 #include "net/base/url_util.h"
 #include "ui/app_list/app_list_folder_item.h"
 #include "ui/app_list/app_list_item.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/gfx/geometry/rect.h"
 
 #if defined(ENABLE_RLZ)
-#include "components/rlz/rlz_tracker.h"
+#include "chrome/browser/rlz/rlz.h"
 #endif
 
 using extensions::ExtensionRegistry;
 
 namespace {
 
 const extensions::Extension* GetExtension(Profile* profile,
                                           const std::string& extension_id) {
   const ExtensionRegistry* registry = ExtensionRegistry::Get(profile);
   const extensions::Extension* extension =
@@ skipping 164 matching lines @@
                                         extensions::ExtensionSet* out_apps) {
   ExtensionRegistry* registry = ExtensionRegistry::Get(profile);
   DCHECK(registry);
   out_apps->InsertAll(registry->enabled_extensions());
   out_apps->InsertAll(registry->disabled_extensions());
   out_apps->InsertAll(registry->terminated_extensions());
 }
 
 void AppListControllerDelegate::OnSearchStarted() {
 #if defined(ENABLE_RLZ)
-  rlz::RLZTracker::RecordAppListSearch();
+  RLZTracker::RecordAppListSearch();
 #endif
 }