Let BaseChromiumApplication manage the tracing controller

content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java

Index: content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java
diff --git a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java
index 8b3046d6ce1d2ea92e9f1367840319ab920b0d42..3e172070434bdcf86fcc3528e4c78587d5085836 100644
--- a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java
+++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellApplication.java
@@ -4,15 +4,15 @@
 
 package org.chromium.content_shell_apk;
 
-import org.chromium.base.BaseChromiumApplication;
 import org.chromium.base.PathUtils;
+import org.chromium.content.app.ContentApplication;
 import org.chromium.content.browser.ResourceExtractor;
 
 /**
  * Entry point for the content shell application.  Handles initialization of information that needs
  * to be shared across the main activity and the child services created.
  */
-public class ContentShellApplication extends BaseChromiumApplication {
+public class ContentShellApplication extends ContentApplication {
 
     private static final String[] MANDATORY_PAK_FILES = new String[] {"content_shell.pak"};
     private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "content_shell";