2 files changed, 9 insertions, 8 deletions
diff --git a/apps/shell/app/shell_main_delegate.cc b/apps/shell/app/shell_main_delegate.cc
index 7043498..2e98a1d 100644
--- a/apps/shell/app/shell_main_delegate.cc
+++ b/apps/shell/app/shell_main_delegate.cc
@@ -67,11 +67,16 @@ void ShellMainDelegate::PreSandboxStartup() {
 }
 
 content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
-  browser_client_.reset(
-      new apps::ShellContentBrowserClient(CreateShellBrowserMainDelegate()));
+  browser_client_.reset(CreateShellContentBrowserClient());
   return browser_client_.get();
 }
 
+content::ContentBrowserClient*
+ShellMainDelegate::CreateShellContentBrowserClient() {
+  return new apps::ShellContentBrowserClient(
+      new DefaultShellBrowserMainDelegate());
+}
+
 content::ContentRendererClient*
 ShellMainDelegate::CreateContentRendererClient() {
   renderer_client_.reset(
@@ -79,10 +84,6 @@ ShellMainDelegate::CreateContentRendererClient() {
   return renderer_client_.get();
 }
 
-ShellBrowserMainDelegate* ShellMainDelegate::CreateShellBrowserMainDelegate() {
-  return new DefaultShellBrowserMainDelegate();
-}
-
 scoped_ptr<ShellRendererMainDelegate>
 ShellMainDelegate::CreateShellRendererMainDelegate() {
   return scoped_ptr<ShellRendererMainDelegate>();
diff --git a/apps/shell/app/shell_main_delegate.h b/apps/shell/app/shell_main_delegate.h
index 13a0e45..465f60e 100644
--- a/apps/shell/app/shell_main_delegate.h
+++ b/apps/shell/app/shell_main_delegate.h
@@ -33,8 +33,8 @@ class ShellMainDelegate : public content::ContentMainDelegate {
       OVERRIDE;
 
  protected:
-  // The created object is owned by ShellBrowserMainParts.
-  virtual ShellBrowserMainDelegate* CreateShellBrowserMainDelegate();
+  // The created object is owned by this object.
+  virtual content::ContentBrowserClient* CreateShellContentBrowserClient();
 
   // The returned object is owned by ShellContentRendererClient.
   virtual scoped_ptr<ShellRendererMainDelegate>