Chromecast: moves all service startup code to PreMainMessageLoopRun.

chromecast/browser/cast_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 "chromecast/browser/cast_browser_main_parts.h"
 
 #include <signal.h>
 #include <sys/prctl.h>
 
 #include "base/command_line.h"
@@ skipping 26 matching lines @@
 #include "media/base/media_switches.h"
 
 #if defined(OS_ANDROID)
 #include "chromecast/crash/android/crash_handler.h"
 #include "components/crash/browser/crash_dump_manager_android.h"
 #include "net/android/network_change_notifier_factory_android.h"
 #endif
 
 namespace {
 
+#if !defined(OS_ANDROID)
 int kSignalsToRunClosure[] = { SIGTERM, SIGINT, };
 
 // Closure to run on SIGTERM and SIGINT.
 base::Closure* g_signal_closure = NULL;
 
 void RunClosureOnSignal(int signum) {
   LOG(ERROR) << "Got signal " << signum;
   DCHECK(g_signal_closure);
   // Expect main thread got this signal. Otherwise, weak_ptr of run_loop will
   // crash the process.
@@ skipping 18 matching lines @@
     if (sigaction(kSignalsToRunClosure[i], &sa_new, &sa_old) == -1) {
       NOTREACHED();
     } else {
       DCHECK_EQ(sa_old.sa_handler, SIG_DFL);
     }
   }
 
   // Get the first signal to exit when the parent process dies.
   prctl(PR_SET_PDEATHSIG, kSignalsToRunClosure[0]);
 }
+#endif  // !defined(OS_ANDROID)
 
 }  // namespace
 
 namespace chromecast {
 namespace shell {
 
 namespace {
 
 struct DefaultCommandLineSwitch {
   const char* const switch_name;
@@ skipping 143 matching lines @@
       cast_browser_process_->metrics_service_client(),
       url_request_context_factory_->GetSystemGetter()));
   cast_browser_process_->cast_service()->Initialize();
 
   // Initializing metrics service and network delegates must happen after cast
   // service is intialized because CastMetricsServiceClient and
   // CastNetworkDelegate may use components initialized by cast service.
   cast_browser_process_->metrics_service_client()
       ->Initialize(cast_browser_process_->cast_service());
   url_request_context_factory_->InitializeNetworkDelegates();
+
+  cast_browser_process_->cast_service()->Start();
 }
 
 bool CastBrowserMainParts::MainMessageLoopRun(int* result_code) {
-  cast_browser_process_->cast_service()->Start();
-
+#if defined(OS_ANDROID)
+  // Android does not use native main MessageLoop.
+  NOTREACHED();
+  return true;
+#else
   base::RunLoop run_loop;
   base::Closure quit_closure(run_loop.QuitClosure());
   RegisterClosureOnSignal(quit_closure);
 
   // If parameters_.ui_task is not NULL, we are running browser tests.
   if (parameters_.ui_task) {
     base::MessageLoop* message_loop = base::MessageLoopForUI::current();
     message_loop->PostTask(FROM_HERE, *parameters_.ui_task);
     message_loop->PostTask(FROM_HERE, quit_closure);
   }
 
   run_loop.Run();
 
   cast_browser_process_->cast_service()->Stop();
   return true;
+#endif
 }
 
 void CastBrowserMainParts::PostMainMessageLoopRun() {
+#if defined(OS_ANDROID)
+  // Android does not use native main MessageLoop.
+  NOTREACHED();
+#else
   cast_browser_process_->cast_service()->Finalize();
   cast_browser_process_->metrics_service_client()->Finalize();
   cast_browser_process_.reset();

[lcwu1, 2015/02/25 21:48:27]

Where does the tear-down of the cast objects take place for Android?

[gunsch, 2015/02/25 21:58:57]

It doesn't. For a similar comment, see:
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/chr...

+#endif
 }
 
 }  // namespace shell
 }  // namespace chromecast