Hook up delegate interfaces so that athena can create its own WebContentsViewDelegate

apps/shell/app/shell_main_delegate.cc

Index: apps/shell/app/shell_main_delegate.cc
diff --git a/apps/shell/app/shell_main_delegate.cc b/apps/shell/app/shell_main_delegate.cc
index 704349863471612c510f3d80d2c94b5dfbe6634a..6c88067610b4f0daf86f05ce980474b2773873d4 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(CreateContentBrowserClient());

[James Cook, 2014/07/16 22:43:33]

Does this call itself? Should this be CreateShellContentBrowserClient()?

[oshima, 2014/07/16 22:49:32]

Oops sorry. Fixed. I forgot that unittest is not using this path.

   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>();