Aura on Android: content/browser

content/browser/browser_main_runner.cc

 // 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.
 
 #include "content/public/browser/browser_main_runner.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
 #include "base/logging.h"
@@ skipping 246 matching lines @@
     if (main_loop_->is_tracing_startup_for_duration()) {
       main_loop_->StopStartupTracingTimer();
       if (main_loop_->startup_trace_file() !=
           base::FilePath().AppendASCII("none")) {
         startup_profiler.reset(
             new BrowserShutdownProfileDumper(main_loop_->startup_trace_file()));
       }
     } else if (tracing::TraceConfigFile::GetInstance()->IsEnabled() &&
                TracingController::GetInstance()->IsRecording()) {
       base::FilePath result_file;
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)

[mfomitchev, 2015/11/03 22:23:20]

@sievers: Do you know off the top of your head if we doing the right thing with
tracing here? (I haven't looked into why we are handing this differently on
Android). If not - I guess we should create a crbug?

[no sievers, 2015/11/04 01:59:32]

I think it's only for startup and shutdown tracing.
Probably ok to ignore for now and revisit as needed. I think the changes you
made are consistent for that stuff.

       TracingControllerAndroid::GenerateTracingFilePath(&result_file);
 #else
       result_file = tracing::TraceConfigFile::GetInstance()->GetResultFile();
 #endif
       startup_profiler.reset(new BrowserShutdownProfileDumper(result_file));
     }
 
     // The shutdown tracing got enabled in AttemptUserExit earlier, but someone
     // needs to write the result to disc. For that a dumper needs to get created
     // which will dump the traces to disc when it gets destroyed.
@@ skipping 52 matching lines @@
 BrowserMainRunner* BrowserMainRunner::Create() {
   return new BrowserMainRunnerImpl();
 }
 
 // static
 bool BrowserMainRunner::ExitedMainMessageLoop() {
   return g_exited_main_message_loop;
 }
 
 }  // namespace content