NOT FOR REVIEW: Aura on Android

content/browser/browser_main_loop.cc

Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index e5ee0cfc3ae607054efc2437abbda88c43ac6914..60d0dbb2f1a7499c760510855706b7459fb530a3 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -583,7 +583,7 @@ void BrowserMainLoop::PostMainMessageLoopStart() {
   }
 #endif  // !defined(OS_IOS)
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
   {
     TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:SurfaceTextureManager");

[no sievers, 2015/10/20 19:24:22]

keep this

     if (parsed_command_line_.HasSwitch(switches::kSingleProcess)) {
@@ -743,13 +743,13 @@ void BrowserMainLoop::CreateStartupTasks() {
         &BrowserMainLoop::PreMainMessageLoopRun, base::Unretained(this));
     startup_task_runner_->AddTask(pre_main_message_loop_run);
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID)// && !defined(USE_AURA)
     if (BrowserMayStartAsynchronously()) {
       startup_task_runner_->StartRunningTasksAsync();
     }
 #endif
   }
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID)// && !defined(USE_AURA)
   if (!BrowserMayStartAsynchronously()) {
     // A second request for asynchronous startup can be ignored, so
     // StartupRunningTasksAsync is only called first time through. If, however,
@@ -1128,7 +1128,9 @@ int BrowserMainLoop::BrowserThreadsStarted() {
 
   bool always_uses_gpu = true;
   bool established_gpu_channel = false;
-#if defined(OS_ANDROID)
+  // TODO(mfomitchev): Need ImageTransportFactory::Initialize on Android Aura,
+  // but figure out what to do with BrowserGpuChannelHostFactory.

[no sievers, 2015/10/20 19:24:22]

We can try to do BrowserGpuChannelHostFactory::Initialize(true).

And for Android GpuDataManagerImpl::GetInstance()->CanUseGpuBrowserCompositor()
should always be true.

+#if defined(OS_ANDROID) && !defined(USE_AURA)
   // TODO(crbug.com/439322): This should be set to |true|.
   established_gpu_channel = false;
   BrowserGpuChannelHostFactory::Initialize(established_gpu_channel);
@@ -1324,7 +1326,7 @@ base::FilePath BrowserMainLoop::GetStartupTraceFileName(
     return trace_file;
 
   if (trace_file.empty()) {
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)

[no sievers, 2015/10/20 19:24:22]

TODO: tracing

     TracingControllerAndroid::GenerateTracingFilePath(&trace_file);
 #else
     // Default to saving the startup trace into the current dir.