NOT FOR REVIEW: Aura on Android

chrome/app/android/chrome_main_delegate_android.cc

Index: chrome/app/android/chrome_main_delegate_android.cc
diff --git a/chrome/app/android/chrome_main_delegate_android.cc b/chrome/app/android/chrome_main_delegate_android.cc
index 24291dee569143a4790d52ad8c6863db5b071380..5905707e2ad9f0f5f74c0d99148a214a3f02e466 100644
--- a/chrome/app/android/chrome_main_delegate_android.cc
+++ b/chrome/app/android/chrome_main_delegate_android.cc
@@ -16,12 +16,14 @@
 
 namespace {
 
+#if !defined(USE_AURA)
 content::BrowserMediaPlayerManager* CreateRemoteMediaPlayerManager(
     content::RenderFrameHost* render_frame_host,
     content::MediaPlayersObserver* audio_monitor) {
   return new remote_media::RemoteMediaPlayerManager(render_frame_host,
                                                     audio_monitor);
 }
+#endif
 
 } // namespace
 
@@ -50,8 +52,8 @@ int ChromeMainDelegateAndroid::RunProcess(
     // Also only record the start time the first time round, since this is the
     // start time of the application, and will be same for all requests.
     if (!browser_runner_.get()) {
-      base::Time startTime = chrome::android::GetMainEntryPointTime();
-      startup_metric_utils::RecordSavedMainEntryPointTime(startTime);
+//      base::Time startTime = chrome::android::GetMainEntryPointTime();
+//      startup_metric_utils::RecordSavedMainEntryPointTime(startTime);
       browser_runner_.reset(content::BrowserMainRunner::Create());
     }
     return browser_runner_->Initialize(main_function_params);
@@ -63,8 +65,10 @@ int ChromeMainDelegateAndroid::RunProcess(
 bool ChromeMainDelegateAndroid::BasicStartupComplete(int* exit_code) {
   SetChromeSpecificCommandLineFlags();
 
+#if !defined(USE_AURA)
   content::BrowserMediaPlayerManager::RegisterFactory(
       &CreateRemoteMediaPlayerManager);
+#endif
 
   return ChromeMainDelegate::BasicStartupComplete(exit_code);
 }