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

chrome/browser/chrome_browser_main.h

Index: chrome/browser/chrome_browser_main.h
diff --git a/chrome/browser/chrome_browser_main.h b/chrome/browser/chrome_browser_main.h
index 6ba5ee3afa9e6cd1af507714e2cbfe53141b0bc0..da58d176abdca1ac215e1e8a69e725c8b05a8b02 100644
--- a/chrome/browser/chrome_browser_main.h
+++ b/chrome/browser/chrome_browser_main.h
@@ -165,10 +165,7 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
 
   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_;
 
@@ -178,7 +175,7 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
 
   // 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_;