Reland "Move PathUtils to use ContextUtils."

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 4eeb69ede91b76f40ecb2741ce58c6148bfdaae6..68f8a087a45dad1d34d44935491b0c9f71553166 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,6 +4,8 @@
 
 package org.chromium.content_shell_apk;
 
+import android.content.Context;
+
 import org.chromium.base.CommandLine;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.PathUtils;
@@ -19,19 +21,15 @@ public class ContentShellApplication extends ContentApplication {
     public static final String COMMAND_LINE_FILE = "/data/local/tmp/content-shell-command-line";
     private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "content_shell";
 
-    public ContentShellApplication() {
-        super();
-        ContextUtils.initApplicationContext(this);
-    }
-
     @Override
-    public void onCreate() {
-        super.onCreate();
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+        ContextUtils.initApplicationContext(this);
     }
 
     @Override
     protected void initializeLibraryDependencies() {
-        PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX, this);
+        PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX);
     }
 
     @SuppressFBWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")