app_shell: Do simple audio initialization.

extensions/shell/browser/shell_browser_main_parts.cc

 // Copyright 2014 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 "extensions/shell/browser/shell_browser_main_parts.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/omaha_query_params/omaha_query_params.h"
@@ skipping 11 matching lines @@
 #include "extensions/shell/browser/shell_extensions_browser_client.h"
 #include "extensions/shell/browser/shell_omaha_query_params_delegate.h"
 #include "extensions/shell/common/shell_extensions_client.h"
 #include "extensions/shell/common/switches.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
+#include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/network/network_handler.h"
+#include "extensions/shell/browser/shell_audio_controller_chromeos.h"
 #include "extensions/shell/browser/shell_network_controller_chromeos.h"
 #endif
 
 #if !defined(DISABLE_NACL)
 #include "components/nacl/browser/nacl_browser.h"
 #include "components/nacl/browser/nacl_process_host.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/shell/browser/shell_nacl_browser_delegate.h"
 #endif
 
 using content::BrowserContext;
 
-namespace {
-
-// Register additional KeyedService factories here. See
-// ChromeBrowserMainExtraPartsProfiles for details.
-void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
-  extensions::EnsureBrowserContextKeyedServiceFactoriesBuilt();
-  extensions::ShellExtensionSystemFactory::GetInstance();
-}
-
-}  // namespace
-
 namespace extensions {
 
 ShellBrowserMainParts::ShellBrowserMainParts(
     const content::MainFunctionParams& parameters,
     ShellBrowserMainDelegate* browser_main_delegate)
     : extension_system_(NULL),
       parameters_(parameters),
       run_message_loop_(true),
       browser_main_delegate_(browser_main_delegate) {
 }
 
 ShellBrowserMainParts::~ShellBrowserMainParts() {
 }
 
 void ShellBrowserMainParts::PreMainMessageLoopStart() {
   // TODO(jamescook): Initialize touch here?
 }
 
 void ShellBrowserMainParts::PostMainMessageLoopStart() {
 #if defined(OS_CHROMEOS)
+  // Perform initialization of D-Bus objects here so as to not step on tests'

[James Cook, 2014/08/27 23:18:33]

super nit: What does "step on tests' toes" mean?  Maybe a less colloquial
comment?

[Daniel Erat, 2014/08/28 00:12:20]

Done.

+  // toes.
   chromeos::DBusThreadManager::Initialize();
+
+  chromeos::NetworkHandler::Initialize();
   network_controller_.reset(new ShellNetworkController(
       base::CommandLine::ForCurrentProcess()->GetSwitchValueNative(
           switches::kAppShellPreferredNetwork)));
+
+  chromeos::CrasAudioHandler::Initialize(
+      new ShellAudioController::PrefHandler());
+  audio_controller_.reset(new ShellAudioController());
 #else
   // Non-Chrome OS platforms are for developer convenience, so use a test IME.
   ui::InitializeInputMethodForTesting();
 #endif
 }
 
 void ShellBrowserMainParts::PreEarlyInitialization() {
 }
 
 int ShellBrowserMainParts::PreCreateThreads() {
@@ skipping 24 matching lines @@
 
   omaha_query_params_delegate_.reset(new ShellOmahaQueryParamsDelegate);
   omaha_query_params::OmahaQueryParams::SetDelegate(
       omaha_query_params_delegate_.get());
 
   // Create our custom ExtensionSystem first because other
   // KeyedServices depend on it.
   // TODO(yoz): Move this after EnsureBrowserContextKeyedServiceFactoriesBuilt.
   CreateExtensionSystem();
 
-  ::EnsureBrowserContextKeyedServiceFactoriesBuilt();
+  // Register additional KeyedService factories here. See
+  // ChromeBrowserMainExtraPartsProfiles for details.
+  EnsureBrowserContextKeyedServiceFactoriesBuilt();

[Daniel Erat, 2014/08/27 23:05:29]

i was initially adding some code to the anon namespace in this change, and i
moved the namespace within extensions. that broke this function (since it has
the same name as the version in the extensions namespace). i ended up moving the
code here. let me know if you'd like me to move it back -- i usually prefer to
nest anonymous namespaces inside of the .cc file's main namespace, though, and
it seemed weird to reuse the name like this.

[James Cook, 2014/08/27 23:18:33]

This seems better.

+  ShellExtensionSystemFactory::GetInstance();
+
   BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices(
       browser_context_.get());
 
 #if !defined(DISABLE_NACL)
   // Takes ownership.
   nacl::NaClBrowser::SetDelegate(
       new ShellNaClBrowserDelegate(browser_context_.get()));
   content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
@@ skipping 30 matching lines @@
   extension_system_ = NULL;
   ExtensionsBrowserClient::Set(NULL);
   extensions_browser_client_.reset();
   browser_context_.reset();
 
   desktop_controller_.reset();
 }
 
 void ShellBrowserMainParts::PostDestroyThreads() {
 #if defined(OS_CHROMEOS)
+  audio_controller_.reset();
+  chromeos::CrasAudioHandler::Shutdown();
   network_controller_.reset();
+  chromeos::NetworkHandler::Shutdown();
   chromeos::DBusThreadManager::Shutdown();
 #endif
 }
 
 void ShellBrowserMainParts::CreateExtensionSystem() {
   DCHECK(browser_context_);
   extension_system_ = static_cast<ShellExtensionSystem*>(
       ExtensionSystem::Get(browser_context_.get()));
   extension_system_->InitForRegularProfile(true);
 }
 
 }  // namespace extensions