Refactor trace_event_impl's SetEnabled to use TraceOptions. Propagate this through the whole stack.

content/app/android/library_loader_hooks.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/app/android_library_loader_hooks.h"
 
 #include "base/android/base_jni_registrar.h"
 #include "base/android/command_line_android.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
@@ skipping 62 matching lines @@
 
 bool LibraryLoaded(JNIEnv* env, jclass clazz,
                           jobjectArray init_command_line) {
   base::android::InitNativeCommandLineFromJavaArray(env, init_command_line);
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   if (command_line->HasSwitch(switches::kTraceStartup)) {
     base::debug::CategoryFilter category_filter(
         command_line->GetSwitchValueASCII(switches::kTraceStartup));
-    base::debug::TraceLog::GetInstance()->SetEnabled(category_filter,
+    base::debug::TraceLog::GetInstance()->SetEnabled(
+        category_filter,
         base::debug::TraceLog::RECORDING_MODE,
-        base::debug::TraceLog::RECORD_UNTIL_FULL);
+        base::debug::TraceOptions(
+            base::debug::RECORD_UNTIL_FULL));

[dsinclair, 2014/07/30 14:25:26]

RECORD_UNTIL_FULL is default, no need to pass.

[dsinclair, 2014/07/30 14:25:26]

nit: Does this fit on the line above?

[nednguyen, 2014/07/30 16:51:15]

Done.

[nednguyen, 2014/07/30 16:51:15]

Done.

   }
 
   // Android's main browser loop is custom so we set the browser
   // name here as early as possible.
   TRACE_EVENT_BEGIN_ETW("BrowserMain", 0, "");
   base::debug::TraceLog::GetInstance()->SetProcessName("Browser");
   base::debug::TraceLog::GetInstance()->SetProcessSortIndex(
       kTraceEventBrowserProcessSortIndex);
 
   // Can only use event tracing after setting up the command line.
   TRACE_EVENT0("jni", "JNI_OnLoad continuation");
 
   logging::LoggingSettings settings;
   settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
   logging::InitLogging(settings);
   // To view log output with IDs and timestamps use "adb logcat -v threadtime".
   logging::SetLogItems(false,    // Process ID
                        false,    // Thread ID
                        false,    // Timestamp
                        false);   // Tick count
   VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
           << ", default verbosity = " << logging::GetVlogVerbosity();
 
   return EnsureJniRegistered(env);
 }
 
 }  // namespace content