Added completion notification to Profile's ClearNetworkingHistorySince.

chrome/test/base/testing_profile.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_TEST_BASE_TESTING_PROFILE_H_
 #define CHROME_TEST_BASE_TESTING_PROFILE_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/scoped_temp_dir.h"
 #include "base/timer.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_impl_io_data.h"
 
 namespace content {
 class MockResourceContext;
 }
 
 namespace extensions {
 class ExtensionPrefs;
 }
 
 namespace history {
@@ skipping 143 matching lines @@
 
   // Blocks until the HistoryService finishes restoring its in-memory cache.
   // This is NOT invoked from CreateHistoryService.
   void BlockUntilHistoryIndexIsRefreshed();
 
   // Blocks until TopSites finishes loading.
   void BlockUntilTopSitesLoaded();
 
   TestingPrefService* GetTestingPrefService();
 
+  // Initializes a skeleton ProfileIOData instance required for some unit tests.
+  void CreateSkeletonIODataForTesting();
+
   // content::BrowserContext
   virtual FilePath GetPath() OVERRIDE;
   virtual bool IsOffTheRecord() const OVERRIDE;
   virtual content::DownloadManagerDelegate*
       GetDownloadManagerDelegate() OVERRIDE;
   // Returns a testing ContextGetter (if one has been created via
   // CreateRequestContext) or NULL. This is not done on-demand for two reasons:
   // (1) Some tests depend on GetRequestContext() returning NULL. (2) Because
   // of the special memory management considerations for the
   // TestURLRequestContextGetter class, many tests would find themseleves
@@ skipping 98 matching lines @@
 #endif  // defined(OS_CHROMEOS)
 
   virtual PrefProxyConfigTracker* GetProxyConfigTracker() OVERRIDE;
 
   // Schedules a task on the history backend and runs a nested loop until the
   // task is processed.  This has the effect of blocking the caller until the
   // history service processes all pending requests.
   void BlockUntilHistoryProcessesPendingRequests();
 
   virtual chrome_browser_net::Predictor* GetNetworkPredictor() OVERRIDE;
-  virtual void ClearNetworkingHistorySince(base::Time time) OVERRIDE;
+  virtual void ClearNetworkingHistorySince(
+      base::Time time,
+      const base::Closure& completion) OVERRIDE;
   virtual GURL GetHomePage() OVERRIDE;
 
   virtual PrefService* GetOffTheRecordPrefs() OVERRIDE;
 
  protected:
   base::Time start_time_;
   scoped_ptr<PrefService> prefs_;
   // ref only for right type, lifecycle is managed by prefs_
   TestingPrefService* testing_prefs_;
 
@@ skipping 38 matching lines @@
 
   scoped_refptr<ExtensionSpecialStoragePolicy>
       extension_special_storage_policy_;
 
   // The proxy prefs tracker.
   scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
 
   // UserCloudPolicyManager returned by GetUserCloudPolicyManager().
   scoped_ptr<policy::UserCloudPolicyManager> user_cloud_policy_manager_;
 
+  // A skeleton ProfileIOData instance, with very limited functionality, needed
+  // for some unit tests.
+  // Initialized on-demand by callingCreateSkeletonIODataForTesting().

[battre, 2012/10/23 08:38:33]

nit: space after calling.

[engedy, 2012/10/23 10:40:09]

Done.

+  scoped_ptr<ProfileImplIOData::Handle> io_data_;
+
   // We use a temporary directory to store testing profile data. In a multi-
   // profile environment, this is invalid and the directory is managed by the
   // TestingProfileManager.
   ScopedTempDir temp_dir_;
   // The path to this profile. This will be valid in either of the two above
   // cases.
   FilePath profile_path_;
 
   // We keep a weak pointer to the dependency manager we want to notify on our
   // death. Defaults to the Singleton implementation but overridable for
   // testing.
   ProfileDependencyManager* profile_dependency_manager_;
 
   scoped_ptr<content::MockResourceContext> resource_context_;
 
   // Weak pointer to a delegate for indicating that a profile was created.
   Delegate* delegate_;
 };
 
 #endif  // CHROME_TEST_BASE_TESTING_PROFILE_H_