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

Unified Diff: chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java

Issue 26740005: Let BaseChromiumApplication manage the tracing controller (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Keep BaseChromiumApplication (required by native unit tests) Created 7 years, 2 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: chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
index 7828c93679c7b0e2462bd8c2b18bf4bc29ff4f84..2bc144c7fa60a136ee4e2ae5fdde69addea8855f 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
+++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
@@ -39,7 +39,6 @@ public class ChromiumTestShellActivity extends Activity implements MenuHandler {
private TabManager mTabManager;
private DevToolsServer mDevToolsServer;
private SyncController mSyncController;
- private TracingControllerAndroid mTracingController;
@Override
protected void onCreate(final Bundle savedInstanceState) {
@@ -233,25 +232,6 @@ public class ChromiumTestShellActivity extends Activity implements MenuHandler {
}
}
- private TracingControllerAndroid getTracingController() {
- if (mTracingController == null) {
- mTracingController = new TracingControllerAndroid(this);
- }
- return mTracingController;
- }
-
- @Override
- protected void onResume() {
- super.onResume();
- getTracingController().registerReceiver(this);
- }
-
- @Override
- protected void onPause() {
- super.onPause();
- getTracingController().unregisterReceiver(this);
- }
-
private static String getUrlFromIntent(Intent intent) {
return intent != null ? intent.getDataString() : null;
}

Powered by Google App Engine
This is Rietveld 408576698