Aura on Android: content/browser

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 5aa05675e33cc87f5f3aa5705f246d69faaae1c6..ac82cb5bd1f1ad4ceb2c1c6ed09292d55452010b 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -596,7 +596,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");
     if (parsed_command_line_.HasSwitch(switches::kSingleProcess)) {
@@ -767,13 +767,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,
@@ -1162,7 +1162,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.
+#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);
@@ -1358,7 +1360,7 @@ base::FilePath BrowserMainLoop::GetStartupTraceFileName(
       return trace_file;
 
     if (trace_file.empty()) {
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
       TracingControllerAndroid::GenerateTracingFilePath(&trace_file);
 #else
       // Default to saving the startup trace into the current dir.
@@ -1366,7 +1368,7 @@ base::FilePath BrowserMainLoop::GetStartupTraceFileName(
 #endif
     }
   } else {
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
     TracingControllerAndroid::GenerateTracingFilePath(&trace_file);
 #else
     trace_file = tracing::TraceConfigFile::GetInstance()->GetResultFile();