Revert of Componentize WebHistoryService

chrome/browser/ui/webui/history_ui.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_HISTORY_UI_H_
 #define CHROME_BROWSER_UI_WEBUI_HISTORY_UI_H_
 
 #include <string>
 
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
+#include "chrome/browser/history/web_history_service.h"
 #include "components/history/core/browser/history_service_observer.h"
-#include "components/history/core/browser/web_history_service.h"
 #include "content/public/browser/web_ui_controller.h"
 #include "content/public/browser/web_ui_message_handler.h"
-#include "ui/base/layout.h"
 
 class HistoryService;
 class ProfileSyncService;
 class SupervisedUserService;
 
 namespace bookmarks {
 class BookmarkModel;
 }
 
 // The handler for Javascript messages related to the "history" view.
@@ skipping 187 matching lines @@
   explicit HistoryUI(content::WebUI* web_ui);
 
   static base::RefCountedMemory* GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HistoryUI);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_HISTORY_UI_H_