Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(280)

Side by Side Diff: content/browser/android/tracing_controller_android.cc

Issue 892213004: Mechanical rename of base::debug -> base::trace_event for /content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_trace_part3_1
Patch Set: Rebase. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/app/content_main_runner.cc ('k') | content/browser/browser_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/android/tracing_controller_android.h" 5 #include "content/browser/android/tracing_controller_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 17 matching lines...) Expand all
28 void TracingControllerAndroid::Destroy(JNIEnv* env, jobject obj) { 28 void TracingControllerAndroid::Destroy(JNIEnv* env, jobject obj) {
29 delete this; 29 delete this;
30 } 30 }
31 31
32 bool TracingControllerAndroid::StartTracing(JNIEnv* env, 32 bool TracingControllerAndroid::StartTracing(JNIEnv* env,
33 jobject obj, 33 jobject obj,
34 jstring jcategories, 34 jstring jcategories,
35 jstring jtraceoptions) { 35 jstring jtraceoptions) {
36 std::string categories = 36 std::string categories =
37 base::android::ConvertJavaStringToUTF8(env, jcategories); 37 base::android::ConvertJavaStringToUTF8(env, jcategories);
38 base::debug::TraceOptions trace_options; 38 base::trace_event::TraceOptions trace_options;
39 trace_options.SetFromString( 39 trace_options.SetFromString(
40 base::android::ConvertJavaStringToUTF8(env, jtraceoptions)); 40 base::android::ConvertJavaStringToUTF8(env, jtraceoptions));
41 41
42 // This log is required by adb_profile_chrome.py. 42 // This log is required by adb_profile_chrome.py.
43 LOG(WARNING) << "Logging performance trace to file"; 43 LOG(WARNING) << "Logging performance trace to file";
44 44
45 return TracingController::GetInstance()->EnableRecording( 45 return TracingController::GetInstance()->EnableRecording(
46 base::debug::CategoryFilter(categories), 46 base::trace_event::CategoryFilter(categories),
47 trace_options, 47 trace_options,
48 TracingController::EnableRecordingDoneCallback()); 48 TracingController::EnableRecordingDoneCallback());
49 } 49 }
50 50
51 void TracingControllerAndroid::StopTracing(JNIEnv* env, 51 void TracingControllerAndroid::StopTracing(JNIEnv* env,
52 jobject obj, 52 jobject obj,
53 jstring jfilepath) { 53 jstring jfilepath) {
54 base::FilePath file_path( 54 base::FilePath file_path(
55 base::android::ConvertJavaStringToUTF8(env, jfilepath)); 55 base::android::ConvertJavaStringToUTF8(env, jfilepath));
56 if (!TracingController::GetInstance()->DisableRecording( 56 if (!TracingController::GetInstance()->DisableRecording(
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 category_list->AppendString(*it); 98 category_list->AppendString(*it);
99 } 99 }
100 std::string received_category_list; 100 std::string received_category_list;
101 base::JSONWriter::Write(category_list.get(), &received_category_list); 101 base::JSONWriter::Write(category_list.get(), &received_category_list);
102 102
103 // This log is required by adb_profile_chrome.py. 103 // This log is required by adb_profile_chrome.py.
104 LOG(WARNING) << "{\"traceCategoriesList\": " << received_category_list << "}"; 104 LOG(WARNING) << "{\"traceCategoriesList\": " << received_category_list << "}";
105 } 105 }
106 106
107 static jstring GetDefaultCategories(JNIEnv* env, jobject obj) { 107 static jstring GetDefaultCategories(JNIEnv* env, jobject obj) {
108 return base::android::ConvertUTF8ToJavaString(env, 108 return base::android::ConvertUTF8ToJavaString(
109 base::debug::CategoryFilter::kDefaultCategoryFilterString).Release(); 109 env,
110 base::trace_event::CategoryFilter::kDefaultCategoryFilterString)
111 .Release();
110 } 112 }
111 113
112 bool RegisterTracingControllerAndroid(JNIEnv* env) { 114 bool RegisterTracingControllerAndroid(JNIEnv* env) {
113 return RegisterNativesImpl(env); 115 return RegisterNativesImpl(env);
114 } 116 }
115 117
116 } // namespace content 118 } // namespace content
OLDNEW
« no previous file with comments | « content/app/content_main_runner.cc ('k') | content/browser/browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698