| Index: content/shell/browser/shell_browser_context.h
|
| diff --git a/content/shell/browser/shell_browser_context.h b/content/shell/browser/shell_browser_context.h
|
| index 3bd5192f850e20e7cd505d3d76d68c54591ad5af..63bbf34905dbee27485b52b3d05fc3e682d82a6f 100644
|
| --- a/content/shell/browser/shell_browser_context.h
|
| +++ b/content/shell/browser/shell_browser_context.h
|
| @@ -29,6 +29,11 @@ class ShellBrowserContext : public BrowserContext {
|
| ShellBrowserContext(bool off_the_record, net::NetLog* net_log);
|
| virtual ~ShellBrowserContext();
|
|
|
| + void set_guest_manager_delegate_for_testing(
|
| + BrowserPluginGuestManagerDelegate* guest_manager_delegate) {
|
| + guest_manager_delegate_ = guest_manager_delegate;
|
| + }
|
| +
|
| // BrowserContext implementation.
|
| virtual base::FilePath GetPath() const OVERRIDE;
|
| virtual bool IsOffTheRecord() const OVERRIDE;
|
| @@ -67,6 +72,8 @@ class ShellBrowserContext : public BrowserContext {
|
| virtual ResourceContext* GetResourceContext() OVERRIDE;
|
| virtual GeolocationPermissionContext*
|
| GetGeolocationPermissionContext() OVERRIDE;
|
| + virtual content::BrowserPluginGuestManagerDelegate*
|
| + GetGuestManagerDelegate() OVERRIDE;
|
| virtual quota::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE;
|
|
|
| net::URLRequestContextGetter* CreateRequestContext(
|
| @@ -89,6 +96,7 @@ class ShellBrowserContext : public BrowserContext {
|
| net::NetLog* net_log_;
|
| bool ignore_certificate_errors_;
|
| base::FilePath path_;
|
| + BrowserPluginGuestManagerDelegate* guest_manager_delegate_;
|
| scoped_ptr<ShellResourceContext> resource_context_;
|
| scoped_ptr<ShellDownloadManagerDelegate> download_manager_delegate_;
|
| scoped_refptr<ShellURLRequestContextGetter> url_request_getter_;
|
|
|