Remove obsolete provider IOSChromeBrowsingDataRemoverProvider.

Inline the two methods that no longer have any bad dependency in client
IOSChromeBrowsingDataRemover, and move GetSafeBrowsingURLRequestContext
method to ChromeBrowserProvider to remove one indirection.

BUG=562155,563936,563581

Review URL: https://codereview.chromium.org/1492443002

Cr-Commit-Position: refs/heads/master@{#362447}

3 files changed, 10 insertions, 60 deletions

diff --git a/ios/public/provider/chrome/browser/browsing_data/ios_chrome_browsing_data_remover_provider.h b/ios/public/provider/chrome/browser/browsing_data/ios_chrome_browsing_data_remover_provider.h
deleted file mode 100644
index 692ebed..0000000
--- a/ios/public/provider/chrome/browser/browsing_data/ios_chrome_browsing_data_remover_provider.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2015 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 IOS_PUBLIC_PROVIDER_CHROME_BROWSER_BROWSING_DATA_IOS_CHROME_BROWSING_DATA_REMOVER_PROVIDER_H_
-#define IOS_PUBLIC_PROVIDER_CHROME_BROWSER_BROWSING_DATA_IOS_CHROME_BROWSING_DATA_REMOVER_PROVIDER_H_
-
-#include "base/basictypes.h"
-#include "base/callback_forward.h"
-
-class GURL;
-
-namespace base {
-class Time;
-}
-
-namespace net {
-class URLRequestContextGetter;
-}
-
-namespace ios {
-
-class ChromeBrowserState;
-
-// A class that provides additional functionality to
-// IOSChromeBrowsingDataRemover.
-class IOSChromeBrowsingDataRemoverProvider {
- public:
-  virtual ~IOSChromeBrowsingDataRemoverProvider() {}
-
-  // Clears the hostname resolution cache and runs |callback| on completion.
-  // If the hostname resolution cache doesn't exist, runs |callback|
-  // immediately.
-  virtual void ClearHostnameResolutionCache(const base::Closure& callback) = 0;
-
-  // Gets the URLRequestContextGetter used by the SafeBrowsing service. Returns
-  // null if there is no SafeBrowsing service.
-  virtual net::URLRequestContextGetter* GetSafeBrowsingURLRequestContext() = 0;
-
-  // Clears the relevant storage partition and runs |callback| on
-  // completion.
-  virtual void ClearStoragePartition(const GURL& remove_url,
-                                     base::Time delete_begin,
-                                     base::Time delete_end,
-                                     const base::Closure& callback) = 0;
-};
-
-}  // namespace ios
-
-#endif  // IOS_PUBLIC_PROVIDER_CHROME_BROWSER_BROWSING_DATA_IOS_CHROME_BROWSING_DATA_REMOVER_PROVIDER_H_
diff --git a/ios/public/provider/chrome/browser/chrome_browser_provider.cc b/ios/public/provider/chrome/browser/chrome_browser_provider.cc
index a12824c..285144b 100644
--- a/ios/public/provider/chrome/browser/chrome_browser_provider.cc
+++ b/ios/public/provider/chrome/browser/chrome_browser_provider.cc
@@ -10,7 +10,6 @@
 #include "components/metrics/metrics_provider.h"
 #include "components/sync_sessions/local_session_event_router.h"
 #include "components/sync_sessions/synced_window_delegates_getter.h"
-#include "ios/public/provider/chrome/browser/browsing_data/ios_chrome_browsing_data_remover_provider.h"
 #include "ios/public/provider/chrome/browser/keyed_service_provider.h"
 
 namespace ios {
@@ -82,12 +81,6 @@ LiveTabContextProvider* ChromeBrowserProvider::GetLiveTabContextProvider() {
   return nullptr;
 }
 
-scoped_ptr<IOSChromeBrowsingDataRemoverProvider>
-ChromeBrowserProvider::GetIOSChromeBrowsingDataRemoverProvider(
-    ChromeBrowserState* browser_state) {
-  return nullptr;
-}
-
 GeolocationUpdaterProvider*
 ChromeBrowserProvider::GetGeolocationUpdaterProvider() {
   return nullptr;
@@ -138,4 +131,9 @@ ChromeBrowserProvider::CreateSyncedWindowDelegatesGetter(
   return nullptr;
 }
 
+net::URLRequestContextGetter*
+ChromeBrowserProvider::GetSafeBrowsingURLRequestContext() {
+  return nullptr;
+}
+
 }  // namespace ios
diff --git a/ios/public/provider/chrome/browser/chrome_browser_provider.h b/ios/public/provider/chrome/browser/chrome_browser_provider.h
index 470b3e4..4509c50 100644
--- a/ios/public/provider/chrome/browser/chrome_browser_provider.h
+++ b/ios/public/provider/chrome/browser/chrome_browser_provider.h
@@ -11,6 +11,7 @@
 #include <vector>
 
 #include "base/callback_forward.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/favicon_base/favicon_callback.h"
 
@@ -57,7 +58,6 @@ class ChromeBrowserState;
 class ChromeBrowserStateManager;
 class ChromeIdentityService;
 class GeolocationUpdaterProvider;
-class IOSChromeBrowsingDataRemoverProvider;
 class SigninResourcesProvider;
 class StringProvider;
 class LiveTabContextProvider;
@@ -103,8 +103,6 @@ class ChromeBrowserProvider {
   virtual StringProvider* GetStringProvider();
   // Returns an instance of a LiveTabContextProvider.
   virtual LiveTabContextProvider* GetLiveTabContextProvider();
-  virtual scoped_ptr<IOSChromeBrowsingDataRemoverProvider>
-  GetIOSChromeBrowsingDataRemoverProvider(ChromeBrowserState* browser_state);
   virtual GeolocationUpdaterProvider* GetGeolocationUpdaterProvider();
   // Returns "enabled", "disabled", or "default".
   virtual std::string DataReductionProxyAvailability();
@@ -139,6 +137,10 @@ class ChromeBrowserProvider {
   // Returns the SyncedWindowDelegatesGetter implementation.
   virtual scoped_ptr<browser_sync::SyncedWindowDelegatesGetter>
   CreateSyncedWindowDelegatesGetter(ios::ChromeBrowserState* browser_state);
+
+  // Gets the URLRequestContextGetter used by the SafeBrowsing service. Returns
+  // null if there is no SafeBrowsing service.
+  virtual net::URLRequestContextGetter* GetSafeBrowsingURLRequestContext();
 };
 
 }  // namespace ios