Revert of Componentize WebHistoryService

chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc

 // Copyright 2014 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 "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/extensions/api/hotword_private/hotword_private_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/history/web_history_service.h"
 #include "chrome/browser/history/web_history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/hotword_audio_history_handler.h"
 #include "chrome/browser/search/hotword_client.h"
 #include "chrome/browser/search/hotword_service.h"
 #include "chrome/browser/search/hotword_service_factory.h"
-#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
-#include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#include "components/history/core/browser/web_history_service.h"
-#include "components/signin/core/browser/profile_oauth2_token_service.h"
-#include "components/signin/core/browser/signin_manager.h"
 #include "extensions/common/switches.h"
 #include "extensions/test/extension_test_message_listener.h"
-#include "net/url_request/url_request_context_getter.h"
 
 namespace {
 
 const char kHotwordTestExtensionId[] = "cpfhkdbjfdgdebcjlifoldbijinjfifp";
 
 // Mock the web history service so that we don't make actual requests over the
 // network.
 class MockWebHistoryService : public history::WebHistoryService {
  public:
   explicit MockWebHistoryService(Profile* profile)
-      : WebHistoryService(
-            ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
-            SigninManagerFactory::GetForProfile(profile),
-            profile->GetRequestContext()),
+      : WebHistoryService(profile),
         expected_success_(true),
         expected_value_(false) {}
   ~MockWebHistoryService() override {}
 
   // For both of the following functions, just call the callback to simulate
   // a successful return from the url fetch.
   void GetAudioHistoryEnabled(
       const AudioWebHistoryCallback& callback) override {
     callback.Run(expected_success_, expected_value_ && expected_success_);
   }
@@ skipping 451 matching lines @@
   ExtensionTestMessageListener setListenerT("set AH: false failure", false);
   ExtensionTestMessageListener setListenerF("set AH: false failure", false);
   ExtensionTestMessageListener getListener("get AH: false failure", false);
 
   ASSERT_TRUE(RunComponentExtensionTest("audioHistory")) << message_;
 
   EXPECT_TRUE(setListenerT.WaitUntilSatisfied());
   EXPECT_TRUE(setListenerF.WaitUntilSatisfied());
   EXPECT_TRUE(getListener.WaitUntilSatisfied());
 }