Index: chrome/test/testing_profile.h |
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h |
index f944ff718e1f058d629abeb1e14d2fae0ef8aced..9fbf4e164bb0eb485bb4ce58ad2799a8010aa588 100644 |
--- a/chrome/test/testing_profile.h |
+++ b/chrome/test/testing_profile.h |
@@ -54,6 +54,10 @@ namespace net { |
class URLRequestContextGetter; |
} |
+namespace quota { |
+class QuotaManager; |
+} |
+ |
class TestingProfile : public Profile { |
public: |
TestingProfile(); |
@@ -143,7 +147,6 @@ class TestingProfile : public Profile { |
virtual void DestroyOffTheRecordProfile() {} |
virtual bool HasOffTheRecordProfile(); |
virtual Profile* GetOriginalProfile(); |
- void SetAppCacheService(ChromeAppCacheService* appcache_service); |
virtual ChromeAppCacheService* GetAppCacheService(); |
virtual webkit_database::DatabaseTracker* GetDatabaseTracker(); |
virtual VisitedLinkMaster* GetVisitedLinkMaster(); |
@@ -286,6 +289,9 @@ class TestingProfile : public Profile { |
TestingPrefService* testing_prefs_; |
private: |
+ // Creates QuotaManager and its clients. |
+ void CreateQuotaManagerAndClients(); |
+ |
// Destroys favicon service if it has been created. |
void DestroyFaviconService(); |
@@ -372,6 +378,12 @@ class TestingProfile : public Profile { |
scoped_refptr<ExtensionSpecialStoragePolicy> |
extension_special_storage_policy_; |
+ scoped_refptr<ChromeAppCacheService> appcache_service_; |
+ |
+ // AppCacheService needs to be initialized on the IO thread, as does the |
+ // request context that it requires. |
+ bool appcache_service_init_finished_; |
+ |
// The proxy prefs tracker. |
scoped_refptr<PrefProxyConfigTracker> pref_proxy_config_tracker_; |
@@ -388,7 +400,7 @@ class TestingProfile : public Profile { |
// testing. |
ProfileDependencyManager* profile_dependency_manager_; |
- scoped_refptr<ChromeAppCacheService> appcache_service_; |
+ scoped_refptr<quota::QuotaManager> quota_manager_; |
}; |
#endif // CHROME_TEST_TESTING_PROFILE_H_ |