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

apps/shell/app/shell_main_delegate.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "apps/shell/app/shell_main_delegate.h"
 
 #include "apps/shell/browser/default_shell_browser_main_delegate.h"
 #include "apps/shell/browser/shell_content_browser_client.h"
 #include "apps/shell/common/shell_content_client.h"
 #include "apps/shell/renderer/shell_content_renderer_client.h"
@@ skipping 49 matching lines @@
 
 void ShellMainDelegate::PreSandboxStartup() {
   std::string process_type =
       CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kProcessType);
   if (ProcessNeedsResourceBundle(process_type))
     InitializeResourceBundle();
 }
 
 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(
       new ShellContentRendererClient(CreateShellRendererMainDelegate()));
   return renderer_client_.get();
 }
 
-ShellBrowserMainDelegate* ShellMainDelegate::CreateShellBrowserMainDelegate() {
-  return new DefaultShellBrowserMainDelegate();
-}
-
 scoped_ptr<ShellRendererMainDelegate>
 ShellMainDelegate::CreateShellRendererMainDelegate() {
   return scoped_ptr<ShellRendererMainDelegate>();
 }
 
 void ShellMainDelegate::InitializeResourceBundle() {
   base::FilePath pak_dir;
   PathService::Get(base::DIR_MODULE, &pak_dir);
   ui::ResourceBundle::InitSharedInstanceWithPakPath(
       pak_dir.AppendASCII("app_shell.pak"));
 }
 
 // static
 bool ShellMainDelegate::ProcessNeedsResourceBundle(
     const std::string& process_type) {
   // The browser process has no process type flag, but needs resources.
   // On Linux the zygote process opens the resources for the renderers.
   return process_type.empty() ||
          process_type == switches::kZygoteProcess ||
          process_type == switches::kRendererProcess ||
          process_type == switches::kUtilityProcess;
 }
 
 }  // namespace apps