| Index: extensions/browser/test_extensions_browser_client.h
|
| diff --git a/extensions/browser/test_extensions_browser_client.h b/extensions/browser/test_extensions_browser_client.h
|
| index 3ea76bed367c73627c21cf6295dccaad67363407..58ed584b41952d8a067541c855ec87c84c89b0ab 100644
|
| --- a/extensions/browser/test_extensions_browser_client.h
|
| +++ b/extensions/browser/test_extensions_browser_client.h
|
| @@ -18,7 +18,7 @@ class TestExtensionsBrowserClient : public ExtensionsBrowserClient {
|
| public:
|
| // |main_context| is required and must not be an incognito context.
|
| explicit TestExtensionsBrowserClient(content::BrowserContext* main_context);
|
| - virtual ~TestExtensionsBrowserClient();
|
| + ~TestExtensionsBrowserClient() override;
|
|
|
| void set_process_manager_delegate(ProcessManagerDelegate* delegate) {
|
| process_manager_delegate_ = delegate;
|
| @@ -34,65 +34,60 @@ class TestExtensionsBrowserClient : public ExtensionsBrowserClient {
|
| void SetIncognitoContext(content::BrowserContext* incognito_context);
|
|
|
| // ExtensionsBrowserClient overrides:
|
| - virtual bool IsShuttingDown() override;
|
| - virtual bool AreExtensionsDisabled(const base::CommandLine& command_line,
|
| - content::BrowserContext* context) override;
|
| - virtual bool IsValidContext(content::BrowserContext* context) override;
|
| - virtual bool IsSameContext(content::BrowserContext* first,
|
| - content::BrowserContext* second) override;
|
| - virtual bool HasOffTheRecordContext(content::BrowserContext* context)
|
| - override;
|
| - virtual content::BrowserContext* GetOffTheRecordContext(
|
| + bool IsShuttingDown() override;
|
| + bool AreExtensionsDisabled(const base::CommandLine& command_line,
|
| + content::BrowserContext* context) override;
|
| + bool IsValidContext(content::BrowserContext* context) override;
|
| + bool IsSameContext(content::BrowserContext* first,
|
| + content::BrowserContext* second) override;
|
| + bool HasOffTheRecordContext(content::BrowserContext* context) override;
|
| + content::BrowserContext* GetOffTheRecordContext(
|
| content::BrowserContext* context) override;
|
| - virtual content::BrowserContext* GetOriginalContext(
|
| + content::BrowserContext* GetOriginalContext(
|
| content::BrowserContext* context) override;
|
| - virtual bool IsGuestSession(content::BrowserContext* context) const override;
|
| - virtual bool IsExtensionIncognitoEnabled(
|
| + bool IsGuestSession(content::BrowserContext* context) const override;
|
| + bool IsExtensionIncognitoEnabled(
|
| const std::string& extension_id,
|
| content::BrowserContext* context) const override;
|
| - virtual bool CanExtensionCrossIncognito(
|
| + bool CanExtensionCrossIncognito(
|
| const extensions::Extension* extension,
|
| content::BrowserContext* context) const override;
|
| - virtual net::URLRequestJob* MaybeCreateResourceBundleRequestJob(
|
| + net::URLRequestJob* MaybeCreateResourceBundleRequestJob(
|
| net::URLRequest* request,
|
| net::NetworkDelegate* network_delegate,
|
| const base::FilePath& directory_path,
|
| const std::string& content_security_policy,
|
| bool send_cors_header) override;
|
| - virtual bool AllowCrossRendererResourceLoad(net::URLRequest* request,
|
| - bool is_incognito,
|
| - const Extension* extension,
|
| - InfoMap* extension_info_map)
|
| - override;
|
| - virtual PrefService* GetPrefServiceForContext(
|
| + bool AllowCrossRendererResourceLoad(net::URLRequest* request,
|
| + bool is_incognito,
|
| + const Extension* extension,
|
| + InfoMap* extension_info_map) override;
|
| + PrefService* GetPrefServiceForContext(
|
| content::BrowserContext* context) override;
|
| - virtual void GetEarlyExtensionPrefsObservers(
|
| + void GetEarlyExtensionPrefsObservers(
|
| content::BrowserContext* context,
|
| std::vector<ExtensionPrefsObserver*>* observers) const override;
|
| - virtual ProcessManagerDelegate* GetProcessManagerDelegate() const override;
|
| - virtual scoped_ptr<ExtensionHostDelegate> CreateExtensionHostDelegate()
|
| - override;
|
| - virtual bool DidVersionUpdate(content::BrowserContext* context) override;
|
| - virtual void PermitExternalProtocolHandler() override;
|
| - virtual scoped_ptr<AppSorting> CreateAppSorting() override;
|
| - virtual bool IsRunningInForcedAppMode() override;
|
| - virtual ApiActivityMonitor* GetApiActivityMonitor(
|
| + ProcessManagerDelegate* GetProcessManagerDelegate() const override;
|
| + scoped_ptr<ExtensionHostDelegate> CreateExtensionHostDelegate() override;
|
| + bool DidVersionUpdate(content::BrowserContext* context) override;
|
| + void PermitExternalProtocolHandler() override;
|
| + scoped_ptr<AppSorting> CreateAppSorting() override;
|
| + bool IsRunningInForcedAppMode() override;
|
| + ApiActivityMonitor* GetApiActivityMonitor(
|
| content::BrowserContext* context) override;
|
| - virtual ExtensionSystemProvider* GetExtensionSystemFactory() override;
|
| - virtual void RegisterExtensionFunctions(
|
| + ExtensionSystemProvider* GetExtensionSystemFactory() override;
|
| + void RegisterExtensionFunctions(
|
| ExtensionFunctionRegistry* registry) const override;
|
| - virtual scoped_ptr<RuntimeAPIDelegate> CreateRuntimeAPIDelegate(
|
| + scoped_ptr<RuntimeAPIDelegate> CreateRuntimeAPIDelegate(
|
| content::BrowserContext* context) const override;
|
| - virtual ComponentExtensionResourceManager*
|
| - GetComponentExtensionResourceManager() override;
|
| - virtual void BroadcastEventToRenderers(
|
| - const std::string& event_name,
|
| - scoped_ptr<base::ListValue> args) override;
|
| - virtual net::NetLog* GetNetLog() override;
|
| - virtual ExtensionCache* GetExtensionCache() override;
|
| - virtual bool IsBackgroundUpdateAllowed() override;
|
| - virtual bool IsMinBrowserVersionSupported(
|
| - const std::string& min_version) override;
|
| + ComponentExtensionResourceManager* GetComponentExtensionResourceManager()
|
| + override;
|
| + void BroadcastEventToRenderers(const std::string& event_name,
|
| + scoped_ptr<base::ListValue> args) override;
|
| + net::NetLog* GetNetLog() override;
|
| + ExtensionCache* GetExtensionCache() override;
|
| + bool IsBackgroundUpdateAllowed() override;
|
| + bool IsMinBrowserVersionSupported(const std::string& min_version) override;
|
|
|
| private:
|
| content::BrowserContext* main_context_; // Not owned.
|
|
|