Added completion notification to Profile's ClearNetworkingHistorySince.

chrome/browser/profiles/profile_impl_io_data.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/profiles/profile_impl_io_data.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 123 matching lines @@
             profile_, io_data_);
   }
   io_data_->predictor_->InitNetworkPredictor(profile_->GetPrefs(),
                                              local_state,
                                              io_thread,
                                              main_request_context_getter_);
 
   io_data_->InitializeMetricsEnabledStateOnUIThread();
 }
 
+void ProfileImplIOData::Handle::InitForTesting() const {
+  using chrome_browser_net::HttpServerPropertiesManager;
+
+  initialized_ = true;
+
+  // Set up an HttpServerPropertiesManager for testing removing browsing data.
+  PrefService* pref_service = profile_->GetPrefs();
+  io_data_->set_http_server_properties_manager(
+      new HttpServerPropertiesManager(pref_service));
+
+  BrowserThread::PostTask(
+      BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(
+          &HttpServerPropertiesManager::InitializeOnIOThread,
+          base::Unretained(io_data_->http_server_properties_manager())));
+
+  io_data_->InitForTesting();
+}
+
 base::Callback<ChromeURLDataManagerBackend*(void)>
 ProfileImplIOData::Handle::GetChromeURLDataManagerBackendGetter() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   LazyInitialize();
   return base::Bind(&ProfileIOData::GetChromeURLDataManagerBackend,
                     base::Unretained(io_data_));
 }
 
 content::ResourceContext*
     ProfileImplIOData::Handle::GetResourceContext() const {
@@ skipping 97 matching lines @@
       GetIsolatedAppRequestContextGetter(app_id);
   ChromeURLRequestContextGetter* context =
       ChromeURLRequestContextGetter::CreateOriginalForIsolatedMedia(
           profile_, app_context, io_data_, app_id);
   isolated_media_request_context_getter_map_[app_id] = context;
 
   return context;
 }
 
 void ProfileImplIOData::Handle::ClearNetworkingHistorySince(
-    base::Time time) {
+    base::Time time,
+    const base::Closure& completion) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   LazyInitialize();
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(
           &ProfileImplIOData::ClearNetworkingHistorySinceOnIOThread,
           base::Unretained(io_data_),
-          time));
+          time,
+          completion));
 }
 
 void ProfileImplIOData::Handle::LazyInitialize() const {
   if (initialized_)
     return;
 
   // Set initialized_ to true at the beginning in case any of the objects
   // below try to get the ResourceContext pointer.
   initialized_ = true;
   PrefService* pref_service = profile_->GetPrefs();
@@ skipping 375 matching lines @@
     net::FtpAuthCache* ftp_auth_cache) const {
   SetUpJobFactoryDefaults(job_factory, protocol_handler_interceptor.Pass(),
                           network_delegate, ftp_transaction_factory,
                           ftp_auth_cache);
 
   job_factory->AddInterceptor(
       new chrome_browser_net::ConnectInterceptor(predictor_.get()));
 }
 
 void ProfileImplIOData::ClearNetworkingHistorySinceOnIOThread(
-    base::Time time) {
+    base::Time time,
+    const base::Closure& completion) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   LazyInitialize();
 
   DCHECK(transport_security_state());
-  transport_security_state()->DeleteSince(time);
+  transport_security_state()->DeleteSince(time);  // Completes synchronously.
   DCHECK(http_server_properties_manager());
-  http_server_properties_manager()->Clear();
+  http_server_properties_manager()->Clear(completion);
 }