base/android/base_jni_registrar.cc - Issue 895853003: Update from https://crrev.com/314320

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/android/base_jni_registrar.cc

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 5 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:

Index: base/android/base_jni_registrar.cc

diff --git a/base/android/base_jni_registrar.cc b/base/android/base_jni_registrar.cc

index 9529b712ca6214b0d029a715f93e0e36065be625..4dda482f928ab9b588538102690a0985b837836d 100644

--- a/base/android/base_jni_registrar.cc

+++ b/base/android/base_jni_registrar.cc

@@ -25,9 +25,9 @@

#include "base/android/thread_utils.h"

#include "base/android/trace_event_binding.h"

#include "base/basictypes.h"

-#include "base/debug/trace_event.h"

#include "base/message_loop/message_pump_android.h"

#include "base/power_monitor/power_monitor_device_source_android.h"

+#include "base/trace_event/trace_event.h"

namespace base {

namespace android {