Category group support/Renamings.

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/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/android/jni_string.h"
@@ skipping 24 matching lines @@
 
 namespace content {
 
 static jint LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz,
                                           jobjectArray init_command_line) {
   InitNativeCommandLineFromJavaArray(env, init_command_line);
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   if (command_line->HasSwitch(switches::kTraceStartup)) {
-    base::debug::TraceLog::GetInstance()->SetEnabled(
-        command_line->GetSwitchValueASCII(switches::kTraceStartup),
+    base::debug::CategoryFilter category_filter(
+        command_line->GetSwitchValueASCII(switches::kTraceStartup));
+    base::debug::TraceLog::GetInstance()->SetEnabled(category_filter,
         base::debug::TraceLog::RECORD_UNTIL_FULL);
   }
 
   // Can only use event tracing after setting up the command line.
   TRACE_EVENT0("jni", "JNI_OnLoad continuation");
 
   // Note: because logging is setup here right after copying the command line
   // array from java to native up top of this method, any code that adds the
   // --enable-dcheck switch must do so on the Java side.
   logging::DcheckState dcheck_state =
@@ skipping 48 matching lines @@
 }
 
 bool RegisterLibraryLoaderEntryHook(JNIEnv* env) {
   // We need the AtExitManager to be created at the very beginning.
   g_at_exit_manager = new base::AtExitManager();
 
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content