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

Unified Diff: base/android/java/src/org/chromium/base/TraceEvent.java

Issue 131553003: Move Android TraceEvent interface to base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Put back content version of TraceEvent*.java as wrappers to ease cross repository commit Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: base/android/java/src/org/chromium/base/TraceEvent.java
diff --git a/content/public/android/java/src/org/chromium/content/common/TraceEvent.java b/base/android/java/src/org/chromium/base/TraceEvent.java
similarity index 98%
copy from content/public/android/java/src/org/chromium/content/common/TraceEvent.java
copy to base/android/java/src/org/chromium/base/TraceEvent.java
index 2b1dac00ef52df33421763227f9787eccc589d1a..d10196395ee1a3a2d7452c008b4229c398f28e10 100644
--- a/content/public/android/java/src/org/chromium/content/common/TraceEvent.java
+++ b/base/android/java/src/org/chromium/base/TraceEvent.java
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-package org.chromium.content.common;
+package org.chromium.base;
import android.os.Build;
import android.os.Looper;
@@ -11,12 +11,8 @@ import android.os.SystemClock;
import android.util.Log;
import android.util.Printer;
-import org.chromium.base.CommandLine;
-import org.chromium.base.ThreadUtils;
-
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-
/**
* Java mirror of Chrome trace event API. See base/debug/trace_event.h. Unlike the native version,
* Java does not have stack objects, so a TRACE_EVENT() which does both TRACE_EVENT_BEGIN() and
@@ -24,6 +20,7 @@ import java.lang.reflect.Method;
* It is OK to use tracing before the native library has loaded, but such traces will
* be ignored. (Perhaps we could devise to buffer them up in future?).
*/
+@JNINamespace("base::android")
public class TraceEvent {
private static volatile boolean sEnabled = false;
@@ -168,7 +165,7 @@ public class TraceEvent {
// Holder for monitor avoids unnecessary construction on non-debug runs
private static final class LooperMonitorHolder {
private static final BasicLooperMonitor sInstance =
- CommandLine.getInstance().hasSwitch(ContentSwitches.ENABLE_IDLE_TRACING) ?
+ CommandLine.getInstance().hasSwitch(BaseSwitches.ENABLE_IDLE_TRACING) ?
new IdleTracingLooperMonitor() : new BasicLooperMonitor();
}

Powered by Google App Engine
This is Rietveld 408576698