Chromium Code Reviews| Index: chrome/test/base/testing_profile.h |
| diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h |
| index 81e4111e8312cf0c2404e82536e7cab00fd48d23..3054daa3253e40c181493e5ceae4f1199e7eceb8 100644 |
| --- a/chrome/test/base/testing_profile.h |
| +++ b/chrome/test/base/testing_profile.h |
| @@ -13,6 +13,7 @@ |
| #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; |
| @@ -176,6 +177,9 @@ class TestingProfile : public Profile { |
| 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; |
| @@ -294,7 +298,9 @@ class TestingProfile : public Profile { |
| 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; |
| @@ -353,6 +359,11 @@ class TestingProfile : public Profile { |
| // 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. |