| Index: chrome/test/base/testing_profile.h
|
| diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h
|
| index 250e6129d7c4aeae746485e043a1d4778a9f7eec..205be4d9f30ed8519844cdac2f4e45438ba75fb7 100644
|
| --- a/chrome/test/base/testing_profile.h
|
| +++ b/chrome/test/base/testing_profile.h
|
| @@ -139,56 +139,57 @@ class TestingProfile : public Profile {
|
|
|
| TestingPrefService* GetTestingPrefService();
|
|
|
| - virtual TestingProfile* AsTestingProfile();
|
| - virtual std::string GetProfileName();
|
| - virtual FilePath GetPath();
|
| + virtual TestingProfile* AsTestingProfile() OVERRIDE;
|
| + virtual std::string GetProfileName() OVERRIDE;
|
| + virtual FilePath GetPath() OVERRIDE;
|
| void set_incognito(bool incognito) { incognito_ = incognito; }
|
| - virtual bool IsOffTheRecord();
|
| + virtual bool IsOffTheRecord() OVERRIDE;
|
| // Assumes ownership.
|
| virtual void SetOffTheRecordProfile(Profile* profile);
|
| - virtual Profile* GetOffTheRecordProfile();
|
| - virtual void DestroyOffTheRecordProfile() {}
|
| - virtual bool HasOffTheRecordProfile();
|
| - virtual Profile* GetOriginalProfile();
|
| + virtual Profile* GetOffTheRecordProfile() OVERRIDE;
|
| + virtual void DestroyOffTheRecordProfile() OVERRIDE {}
|
| + virtual bool HasOffTheRecordProfile() OVERRIDE;
|
| + virtual Profile* GetOriginalProfile() OVERRIDE;
|
| void SetAppCacheService(ChromeAppCacheService* appcache_service);
|
| - virtual ChromeAppCacheService* GetAppCacheService();
|
| - virtual webkit_database::DatabaseTracker* GetDatabaseTracker();
|
| - virtual VisitedLinkMaster* GetVisitedLinkMaster();
|
| - virtual ExtensionService* GetExtensionService();
|
| - virtual UserScriptMaster* GetUserScriptMaster();
|
| - virtual ExtensionDevToolsManager* GetExtensionDevToolsManager();
|
| - virtual ExtensionProcessManager* GetExtensionProcessManager();
|
| - virtual ExtensionMessageService* GetExtensionMessageService();
|
| - virtual ExtensionEventRouter* GetExtensionEventRouter();
|
| + virtual ChromeAppCacheService* GetAppCacheService() OVERRIDE;
|
| + virtual webkit_database::DatabaseTracker* GetDatabaseTracker() OVERRIDE;
|
| + virtual VisitedLinkMaster* GetVisitedLinkMaster() OVERRIDE;
|
| + virtual ExtensionService* GetExtensionService() OVERRIDE;
|
| + virtual UserScriptMaster* GetUserScriptMaster() OVERRIDE;
|
| + virtual ExtensionDevToolsManager* GetExtensionDevToolsManager() OVERRIDE;
|
| + virtual ExtensionProcessManager* GetExtensionProcessManager() OVERRIDE;
|
| + virtual ExtensionMessageService* GetExtensionMessageService() OVERRIDE;
|
| + virtual ExtensionEventRouter* GetExtensionEventRouter() OVERRIDE;
|
| void SetExtensionSpecialStoragePolicy(
|
| ExtensionSpecialStoragePolicy* extension_special_storage_policy);
|
| - virtual ExtensionSpecialStoragePolicy* GetExtensionSpecialStoragePolicy();
|
| - virtual SSLHostState* GetSSLHostState();
|
| - virtual FaviconService* GetFaviconService(ServiceAccessType access);
|
| - virtual HistoryService* GetHistoryService(ServiceAccessType access);
|
| - virtual HistoryService* GetHistoryServiceWithoutCreating();
|
| + virtual ExtensionSpecialStoragePolicy*
|
| + GetExtensionSpecialStoragePolicy() OVERRIDE;
|
| + virtual SSLHostState* GetSSLHostState() OVERRIDE;
|
| + virtual FaviconService* GetFaviconService(ServiceAccessType access) OVERRIDE;
|
| + virtual HistoryService* GetHistoryService(ServiceAccessType access) OVERRIDE;
|
| + virtual HistoryService* GetHistoryServiceWithoutCreating() OVERRIDE;
|
| // The CookieMonster will only be returned if a Context has been created. Do
|
| // this by calling CreateRequestContext(). See the note at GetRequestContext
|
| // for more information.
|
| net::CookieMonster* GetCookieMonster();
|
| - virtual AutocompleteClassifier* GetAutocompleteClassifier();
|
| - virtual history::ShortcutsBackend* GetShortcutsBackend();
|
| - virtual WebDataService* GetWebDataService(ServiceAccessType access);
|
| - virtual WebDataService* GetWebDataServiceWithoutCreating();
|
| - virtual PasswordStore* GetPasswordStore(ServiceAccessType access);
|
| + virtual AutocompleteClassifier* GetAutocompleteClassifier() OVERRIDE;
|
| + virtual history::ShortcutsBackend* GetShortcutsBackend() OVERRIDE;
|
| + virtual WebDataService* GetWebDataService(ServiceAccessType access) OVERRIDE;
|
| + virtual WebDataService* GetWebDataServiceWithoutCreating() OVERRIDE;
|
| + virtual PasswordStore* GetPasswordStore(ServiceAccessType access) OVERRIDE;
|
| // Sets the profile's PrefService. If a pref service hasn't been explicitly
|
| // set GetPrefs creates one, so normally you need not invoke this. If you need
|
| // to set a pref service you must invoke this before GetPrefs.
|
| // TestingPrefService takes ownership of |prefs|.
|
| void SetPrefService(PrefService* prefs);
|
| - virtual PrefService* GetPrefs();
|
| - virtual TemplateURLFetcher* GetTemplateURLFetcher();
|
| - virtual history::TopSites* GetTopSites();
|
| - virtual history::TopSites* GetTopSitesWithoutCreating();
|
| - virtual DownloadManager* GetDownloadManager();
|
| - virtual fileapi::FileSystemContext* GetFileSystemContext();
|
| + virtual PrefService* GetPrefs() OVERRIDE;
|
| + virtual TemplateURLFetcher* GetTemplateURLFetcher() OVERRIDE;
|
| + virtual history::TopSites* GetTopSites() OVERRIDE;
|
| + virtual history::TopSites* GetTopSitesWithoutCreating() OVERRIDE;
|
| + virtual DownloadManager* GetDownloadManager() OVERRIDE;
|
| + virtual fileapi::FileSystemContext* GetFileSystemContext() OVERRIDE;
|
| virtual void SetQuotaManager(quota::QuotaManager* manager);
|
| - virtual quota::QuotaManager* GetQuotaManager();
|
| + virtual quota::QuotaManager* GetQuotaManager() OVERRIDE;
|
|
|
| // Returns a testing ContextGetter (if one has been created via
|
| // CreateRequestContext) or NULL. This is not done on-demand for two reasons:
|
| @@ -198,29 +199,31 @@ class TestingProfile : public Profile {
|
| // leaking if they called this method without the necessary IO thread. This
|
| // getter is currently only capable of returning a Context that helps test
|
| // the CookieMonster. See implementation comments for more details.
|
| - virtual net::URLRequestContextGetter* GetRequestContext();
|
| + virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
|
| virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess(
|
| - int renderer_child_id);
|
| + int renderer_child_id) OVERRIDE;
|
| void CreateRequestContext();
|
| // Clears out the created request context (which must be done before shutting
|
| // down the IO thread to avoid leaks).
|
| void ResetRequestContext();
|
|
|
| - virtual net::URLRequestContextGetter* GetRequestContextForMedia();
|
| - virtual net::URLRequestContextGetter* GetRequestContextForExtensions();
|
| + virtual net::URLRequestContextGetter* GetRequestContextForMedia() OVERRIDE;
|
| + virtual net::URLRequestContextGetter*
|
| + GetRequestContextForExtensions() OVERRIDE;
|
| virtual net::URLRequestContextGetter* GetRequestContextForIsolatedApp(
|
| - const std::string& app_id);
|
| -
|
| - virtual const content::ResourceContext& GetResourceContext();
|
| -
|
| - virtual net::SSLConfigService* GetSSLConfigService();
|
| - virtual UserStyleSheetWatcher* GetUserStyleSheetWatcher();
|
| - virtual FindBarState* GetFindBarState();
|
| - virtual HostContentSettingsMap* GetHostContentSettingsMap();
|
| - virtual GeolocationPermissionContext* GetGeolocationPermissionContext();
|
| - virtual SpeechInputPreferences* GetSpeechInputPreferences();
|
| - virtual HostZoomMap* GetHostZoomMap();
|
| - virtual bool HasProfileSyncService() const;
|
| + const std::string& app_id) OVERRIDE;
|
| +
|
| + virtual const content::ResourceContext& GetResourceContext() OVERRIDE;
|
| +
|
| + virtual net::SSLConfigService* GetSSLConfigService() OVERRIDE;
|
| + virtual UserStyleSheetWatcher* GetUserStyleSheetWatcher() OVERRIDE;
|
| + virtual FindBarState* GetFindBarState() OVERRIDE;
|
| + virtual HostContentSettingsMap* GetHostContentSettingsMap() OVERRIDE;
|
| + virtual GeolocationPermissionContext*
|
| + GetGeolocationPermissionContext() OVERRIDE;
|
| + virtual SpeechInputPreferences* GetSpeechInputPreferences() OVERRIDE;
|
| + virtual HostZoomMap* GetHostZoomMap() OVERRIDE;
|
| + virtual bool HasProfileSyncService() const OVERRIDE;
|
| virtual std::wstring GetName();
|
| virtual void SetName(const std::wstring& name) {}
|
| virtual std::wstring GetID();
|
| @@ -228,38 +231,39 @@ class TestingProfile : public Profile {
|
| void set_last_session_exited_cleanly(bool value) {
|
| last_session_exited_cleanly_ = value;
|
| }
|
| - virtual bool DidLastSessionExitCleanly();
|
| + virtual bool DidLastSessionExitCleanly() OVERRIDE;
|
| virtual void MergeResourceString(int message_id,
|
| std::wstring* output_string) {}
|
| virtual void MergeResourceInteger(int message_id, int* output_value) {}
|
| virtual void MergeResourceBoolean(int message_id, bool* output_value) {}
|
| - virtual BookmarkModel* GetBookmarkModel();
|
| - virtual bool IsSameProfile(Profile *p);
|
| - virtual base::Time GetStartTime() const;
|
| - virtual ProtocolHandlerRegistry* GetProtocolHandlerRegistry();
|
| - virtual SpellCheckHost* GetSpellCheckHost();
|
| - virtual void ReinitializeSpellCheckHost(bool force) { }
|
| - virtual WebKitContext* GetWebKitContext();
|
| + virtual BookmarkModel* GetBookmarkModel() OVERRIDE;
|
| + virtual bool IsSameProfile(Profile *p) OVERRIDE;
|
| + virtual base::Time GetStartTime() const OVERRIDE;
|
| + virtual ProtocolHandlerRegistry* GetProtocolHandlerRegistry() OVERRIDE;
|
| + virtual SpellCheckHost* GetSpellCheckHost() OVERRIDE;
|
| + virtual void ReinitializeSpellCheckHost(bool force) OVERRIDE { }
|
| + virtual WebKitContext* GetWebKitContext() OVERRIDE;
|
| virtual WebKitContext* GetOffTheRecordWebKitContext();
|
| - virtual void MarkAsCleanShutdown() {}
|
| - virtual void InitExtensions(bool extensions_enabled) {}
|
| - virtual void InitPromoResources() {}
|
| - virtual void InitRegisteredProtocolHandlers() {}
|
| + virtual void MarkAsCleanShutdown() OVERRIDE {}
|
| + virtual void InitExtensions(bool extensions_enabled) OVERRIDE {}
|
| + virtual void InitPromoResources() OVERRIDE {}
|
| + virtual void InitRegisteredProtocolHandlers() OVERRIDE {}
|
|
|
| - virtual FilePath last_selected_directory();
|
| - virtual void set_last_selected_directory(const FilePath& path);
|
| + virtual FilePath last_selected_directory() OVERRIDE;
|
| + virtual void set_last_selected_directory(const FilePath& path) OVERRIDE;
|
| #if defined(OS_CHROMEOS)
|
| - virtual void SetupChromeOSEnterpriseExtensionObserver() {
|
| + virtual void SetupChromeOSEnterpriseExtensionObserver() OVERRIDE {
|
| }
|
| - virtual void InitChromeOSPreferences() {
|
| + virtual void InitChromeOSPreferences() OVERRIDE {
|
| }
|
| - virtual void ChangeAppLocale(const std::string&, AppLocaleChangedVia) {
|
| + virtual void ChangeAppLocale(const std::string&,
|
| + AppLocaleChangedVia) OVERRIDE {
|
| }
|
| - virtual void OnLogin() {
|
| + virtual void OnLogin() OVERRIDE {
|
| }
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| - virtual PrefProxyConfigTracker* GetProxyConfigTracker();
|
| + 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
|
| @@ -267,20 +271,20 @@ class TestingProfile : public Profile {
|
| void BlockUntilHistoryProcessesPendingRequests();
|
|
|
| // Creates and initializes a profile sync service if the tests require one.
|
| - virtual TokenService* GetTokenService();
|
| - virtual ProfileSyncService* GetProfileSyncService();
|
| + virtual TokenService* GetTokenService() OVERRIDE;
|
| + virtual ProfileSyncService* GetProfileSyncService() OVERRIDE;
|
| virtual ProfileSyncService* GetProfileSyncService(
|
| - const std::string& cros_notes);
|
| - virtual ChromeBlobStorageContext* GetBlobStorageContext();
|
| - virtual ExtensionInfoMap* GetExtensionInfoMap();
|
| - virtual PromoCounter* GetInstantPromoCounter();
|
| - virtual ChromeURLDataManager* GetChromeURLDataManager();
|
| - virtual chrome_browser_net::Predictor* GetNetworkPredictor();
|
| + const std::string& cros_notes) OVERRIDE;
|
| + virtual ChromeBlobStorageContext* GetBlobStorageContext() OVERRIDE;
|
| + virtual ExtensionInfoMap* GetExtensionInfoMap() OVERRIDE;
|
| + virtual PromoCounter* GetInstantPromoCounter() OVERRIDE;
|
| + virtual ChromeURLDataManager* GetChromeURLDataManager() OVERRIDE;
|
| + virtual chrome_browser_net::Predictor* GetNetworkPredictor() OVERRIDE;
|
| virtual void ClearNetworkingHistorySince(base::Time time) OVERRIDE;
|
| virtual GURL GetHomePage() OVERRIDE;
|
| virtual NetworkActionPredictor* GetNetworkActionPredictor() OVERRIDE;
|
|
|
| - virtual PrefService* GetOffTheRecordPrefs();
|
| + virtual PrefService* GetOffTheRecordPrefs() OVERRIDE;
|
|
|
| // TODO(jam): remove me once webkit_context_unittest.cc doesn't use Profile
|
| // and gets the quota::SpecialStoragePolicy* from whatever ends up replacing
|
|
|