Revert of Componentize WebHistoryService

chrome/browser/history/web_history_service.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 COMPONENTS_HISTORY_CORE_BROWSER_WEB_HISTORY_SERVICE_H_
-#define COMPONENTS_HISTORY_CORE_BROWSER_WEB_HISTORY_SERVICE_H_
+#ifndef CHROME_BROWSER_HISTORY_WEB_HISTORY_SERVICE_H_
+#define CHROME_BROWSER_HISTORY_WEB_HISTORY_SERVICE_H_
 
 #include <set>
-#include <string>
-#include <vector>
 
-#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "chrome/browser/profiles/profile.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/keyed_service/core/keyed_service.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace net {
-class URLRequestContextGetter;
+class URLFetcher;
 }
 
-class OAuth2TokenService;
-class SigninManagerBase;
-
 namespace history {
 
 // Provides an API for querying Google servers for a signed-in user's
 // synced history visits. It is roughly analogous to HistoryService, and
 // supports a similar API.
 class WebHistoryService : public KeyedService {
  public:
   // Handles all the work of making an API request. This class encapsulates
   // the entire state of the request. When an instance is destroyed, all
   // aspects of the request are cancelled.
@@ skipping 27 matching lines @@
   typedef base::Callback<void(Request*, const base::DictionaryValue*)>
       QueryWebHistoryCallback;
 
   typedef base::Callback<void(bool success)> ExpireWebHistoryCallback;
 
   typedef base::Callback<void(bool success, bool new_enabled_value)>
       AudioWebHistoryCallback;
 
   typedef base::Callback<void(Request*, bool success)> CompletionCallback;
 
-  WebHistoryService(
-      OAuth2TokenService* token_service,
-      SigninManagerBase* signin_manager,
-      const scoped_refptr<net::URLRequestContextGetter>& request_context);
+  explicit WebHistoryService(Profile* profile);
   ~WebHistoryService() override;
 
   // Searches synced history for visits matching |text_query|. The timeframe to
   // search, along with other options, is specified in |options|. If
   // |text_query| is empty, all visits in the timeframe will be returned.
   // This method is the equivalent of HistoryService::QueryHistory.
   // The caller takes ownership of the returned Request. If it is destroyed, the
   // request is cancelled.
   scoped_ptr<Request> QueryHistory(
       const base::string16& text_query,
@@ skipping 53 matching lines @@
   // server has completed. Unpacks the response and calls |callback|, which is
   // the original callback that was passed to AudioHistory().
   void AudioHistoryCompletionCallback(
     const WebHistoryService::AudioWebHistoryCallback& callback,
     WebHistoryService::Request* request,
     bool success);
 
  private:
   friend class WebHistoryServiceTest;
 
-  // Stores pointer to OAuth2TokenService and SigninManagerBase instance. They
-  // must outlive the WebHistoryService and can be null during tests.
-  OAuth2TokenService* token_service_;
-  SigninManagerBase* signin_manager_;
-
-  // Request context getter to use.
-  scoped_refptr<net::URLRequestContextGetter> request_context_;
+  Profile* profile_;
 
   // Stores the version_info token received from the server in response to
   // a mutation operation (e.g., deleting history). This is used to ensure that
   // subsequent reads see a version of the data that includes the mutation.
   std::string server_version_info_;
 
   // Pending expiration requests to be canceled if not complete by profile
   // shutdown.
   std::set<Request*> pending_expire_requests_;
 
   // Pending requests to be canceled if not complete by profile shutdown.
   std::set<Request*> pending_audio_history_requests_;
 
   base::WeakPtrFactory<WebHistoryService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebHistoryService);
 };
 
 }  // namespace history
 
-#endif  // COMPONENTS_HISTORY_CORE_BROWSER_WEB_HISTORY_SERVICE_H_
+#endif  // CHROME_BROWSER_HISTORY_WEB_HISTORY_SERVICE_H_