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

chrome/browser/chrome_browser_main.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
@@ skipping 147 matching lines @@
   StackSamplingConfiguration sampling_profiler_config_;
 
   // A profiler that periodically samples stack traces. Used to sample startup
   // behavior.
   base::StackSamplingProfiler sampling_profiler_;
 
   // Members initialized after / released before main_message_loop_ ------------
 
   scoped_ptr<BrowserProcessImpl> browser_process_;
   scoped_refptr<metrics::TrackingSynchronizer> tracking_synchronizer_;
-
-  // TODO(bshe): Use !defined(ANDROID_JAVA_UI) once
-  // codereview.chromium.org/1459793002 landed.
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#if !defined(OS_ANDROID)
   // Browser creation happens on the Java side in Android.
   scoped_ptr<StartupBrowserCreator> browser_creator_;
 
   // Android doesn't support multiple browser processes, so it doesn't implement
   // ProcessSingleton.
   scoped_ptr<ChromeProcessSingleton> process_singleton_;
 
   // Android's first run is done in Java instead of native.
   scoped_ptr<first_run::MasterPrefs> master_prefs_;
-#endif  // !defined(OS_ANDROID) || defined(USE_AURA)
+#endif
   Profile* profile_;
   bool run_message_loop_;
   ProcessSingleton::NotifyResult notify_result_;
   scoped_ptr<ThreeDAPIObserver> three_d_observer_;
 
   // Initialized in SetupMetricsAndFieldTrials.
   scoped_refptr<FieldTrialSynchronizer> field_trial_synchronizer_;
 
   // Members initialized in PreMainMessageLoopRun, needed in
   // PreMainMessageLoopRunThreadsCreated.
   PrefService* local_state_;
   base::FilePath user_data_dir_;
 
   // Members needed across shutdown methods.
   bool restart_last_session_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts);
 };
 
 #endif  // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_