| Index: content/shell/browser/shell_browser_context.cc
|
| diff --git a/content/shell/browser/shell_browser_context.cc b/content/shell/browser/shell_browser_context.cc
|
| index 7778ff65a716e60adca110cfce1d69d45e701cc8..87db8621ac8ac8941eb92874d43d52f93b713c1e 100644
|
| --- a/content/shell/browser/shell_browser_context.cc
|
| +++ b/content/shell/browser/shell_browser_context.cc
|
| @@ -65,7 +65,7 @@ ShellBrowserContext::ShellBrowserContext(bool off_the_record,
|
| : off_the_record_(off_the_record),
|
| net_log_(net_log),
|
| ignore_certificate_errors_(false),
|
| - guest_manager_delegate_(NULL),
|
| + guest_manager_(NULL),
|
| resource_context_(new ShellResourceContext) {
|
| InitWhileIOAllowed();
|
| }
|
| @@ -235,9 +235,9 @@ GeolocationPermissionContext*
|
| return NULL;
|
| }
|
|
|
| -BrowserPluginGuestManagerDelegate*
|
| - ShellBrowserContext::GetGuestManagerDelegate() {
|
| - return guest_manager_delegate_;
|
| +BrowserPluginGuestManager*
|
| + ShellBrowserContext::GetGuestManager() {
|
| + return guest_manager_;
|
| }
|
|
|
| quota::SpecialStoragePolicy* ShellBrowserContext::GetSpecialStoragePolicy() {
|
|
|