Revert of Activating code to start Chrome UI in Android Aura Chrome

chrome/browser/chrome_browser_main.cc

Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index b264d2070d447470b61e36a69f4a7a746825b9c2..dfdf8160c4b39f06debdc8bf3d4879cd5c6df9d5 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -796,8 +796,6 @@ void ChromeBrowserMainParts::RecordBrowserStartupTime() {
   // On Android, first run is handled in Java code, and the C++ side of Chrome
   // doesn't know if this is the first run. This will cause some inaccuracy in
   // the UMA statistics, but this should be minor (first runs are rare).
-  // TODO(bshe): Figure out which first run code to use for Aura Android. See
-  // crbug.com/560498
   is_first_run = first_run::IsChromeFirstRun();
 #endif  // defined(OS_ANDROID)
 
@@ -871,13 +869,11 @@ int ChromeBrowserMainParts::PreCreateThreads() {
   result_code_ = PreCreateThreadsImpl();
 
   if (result_code_ == content::RESULT_CODE_NORMAL_EXIT) {
-  // TODO(bshe): Use !defined(ANDROID_JAVA_UI) once
-  // codereview.chromium.org/1459793002 landed.
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#if !defined(OS_ANDROID)
     // These members must be initialized before exiting this function normally.
     DCHECK(master_prefs_.get());
     DCHECK(browser_creator_.get());
-#endif  // !defined(OS_ANDROID) || defined(USE_AURA)
+#endif  // !defined(OS_ANDROID)
     for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
       chrome_extra_parts_[i]->PreCreateThreads();
   }
@@ -898,8 +894,6 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
   MediaCaptureDevicesDispatcher::GetInstance();
 
   // Android's first run is done in Java instead of native.
-  // TODO(bshe): Figure out which first run code to use for Aura Android. See
-  // crbug.com/560498
 #if !defined(OS_ANDROID)
   process_singleton_.reset(new ChromeProcessSingleton(
       user_data_dir_, base::Bind(&ProcessSingletonNotificationCallback)));
@@ -937,16 +931,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
   local_state_ = InitializeLocalState(
       local_state_task_runner.get(), parsed_command_line());
 
-  // TODO(bshe): Use !defined(ANDROID_JAVA_UI) once
-  // codereview.chromium.org/1459793002 landed.
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#if !defined(OS_ANDROID)
   // These members must be initialized before returning from this function.
   master_prefs_.reset(new first_run::MasterPrefs);
   // Android doesn't use StartupBrowserCreator.
   browser_creator_.reset(new StartupBrowserCreator);
   // TODO(yfriedman): Refactor Android to re-use UMABrowsingActivityObserver
   chrome::UMABrowsingActivityObserver::Init();
-#endif  // !defined(OS_ANDROID) || defined(USE_AURA)
+#endif  // !defined(OS_ANDROID)
 
 #if !defined(OS_CHROMEOS)
   // Convert active labs into switches. This needs to be done before
@@ -1021,7 +1013,6 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
     base::FilePath resources_pack_path;
     PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);
 #if defined(OS_ANDROID)
-    // Uses Android resources even without ANDROID_JAVA_UI.
     ui::LoadMainAndroidPackFile("assets/resources.pak", resources_pack_path);
 #else
     ResourceBundle::GetSharedInstance().AddDataPackFromPath(
@@ -1032,8 +1023,6 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
 
   // Android does first run in Java instead of native.
   // Chrome OS has its own out-of-box-experience code.
-  // TODO(bshe): Figure out which first run code to use for Aura Android. See
-  // crbug.com/560498
 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
   // On first run, we need to process the predictor preferences before the
   // browser's profile_manager object is created, but after ResourceBundle
@@ -1467,14 +1456,12 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   if (!profile_)
     return content::RESULT_CODE_NORMAL_EXIT;
 
-  // TODO(bshe): Use !defined(ANDROID_JAVA_UI) once
-  // codereview.chromium.org/1459793002 landed.
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#if !defined(OS_ANDROID)
   const base::TimeTicks start_time_step2 = base::TimeTicks::Now();
   // The first run sentinel must be created after the process singleton was
   // grabbed and no early return paths were otherwise hit above.
   first_run::CreateSentinelIfNeeded();
-#endif  // !defined(OS_ANDROID) || defined(USE_AURA)
+#endif  // !defined(OS_ANDROID)
 
 #if defined(ENABLE_BACKGROUND)
   // Autoload any profiles which are running background apps.
@@ -1516,8 +1503,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   // Note that this be done _after_ the PrefService is initialized and all
   // preferences are registered, since some of the code that the importer
   // touches reads preferences.
-  // TODO(bshe): Figure out which first run code to use for Aura Android. See
-  // crbug.com/560498
   if (first_run::IsChromeFirstRun()) {
     first_run::AutoImport(profile_,
                           master_prefs_->homepage_defined,
@@ -1652,10 +1637,9 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
       g_browser_process->local_state());
   ThreadWatcherList::StartWatchingAll(parsed_command_line());
 
-  // TODO(bshe): Aura Android may need this call. See crbug.com/565317.
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
   ThreadWatcherAndroid::RegisterApplicationStatusListener();
-#endif  // defined(OS_ANDROID) && !defined(USE_AURA)
+#endif  // defined(OS_ANDROID)
 
 #if !defined(DISABLE_NACL)
   BrowserThread::PostTask(
@@ -1682,9 +1666,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   if (!parsed_command_line().HasSwitch(switches::kDisableComponentUpdate))
     RegisterComponentsForUpdate();
 
-  // TODO(bshe): Use defined(ANDROID_JAVA_UI) once
-  // codereview.chromium.org/1459793002 landed.
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
   variations::VariationsService* variations_service =
       browser_process_->variations_service();
   if (variations_service) {
@@ -1694,6 +1676,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   }
   translate::TranslateDownloadManager::RequestLanguageList(
       profile_->GetPrefs());
+
 #else
   // Most general initialization is behind us, but opening a
   // tab and/or session restore and such is still to be done.
@@ -1770,11 +1753,9 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
     content::StartPowerUsageMonitor();
 #endif  // !defined(OS_LINUX) || defined(OS_CHROMEOS)
 
-#if !defined(OS_ANDROID)
   process_power_collector_.reset(new ProcessPowerCollector);
   process_power_collector_->Initialize();
 #endif  // !defined(OS_ANDROID)
-#endif  // defined(OS_ANDROID) && !defined(USE_AURA)
 
   PostBrowserStart();
 
@@ -1792,12 +1773,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   }
 #endif  // defined(OS_ANDROID)
 
-  // TODO(bshe): Use !defined(ANDROID_JAVA_UI) once
-  // codereview.chromium.org/1459793002 landed.
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#if !defined(OS_ANDROID)
   UMA_HISTOGRAM_TIMES("Startup.PreMainMessageLoopRunImplStep3Time",
                       base::TimeTicks::Now() - start_time_step3);
-#endif  // !defined(OS_ANDROID) || defined(USE_AURA)
+#endif  // !defined(OS_ANDROID)
 
   return result_code_;
 }