Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / android_webview / test / shell / src / org / chromium / android_webview / shell / AwShellApplication.java

diff --git a/src/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java b/src/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java
index 6f92ba3..46276ab 100644 (file)
--- a/src/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java
+++ b/src/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java
@@ -11,15 +11,17 @@ import android.util.Log;
 import org.chromium.android_webview.AwBrowserProcess;
 import org.chromium.base.BaseSwitches;
 import org.chromium.base.CommandLine;
-import org.chromium.content.browser.ResourceExtractor;
+import org.chromium.base.ResourceExtractor;
+import org.chromium.base.TraceEvent;
 
+/**
+ * The android_webview shell Application subclass.
+ */
 public class AwShellApplication extends Application {
 
     private static final String TAG = "AwShellApplication";
     /** The minimum set of .pak files the test runner needs. */
-    private static final String[] MANDATORY_PAKS = {
-        "webviewchromium.pak", "en-US.pak"
-    };
+    private static final String[] MANDATORY_PAKS = { "icudtl.dat" };
 
     @Override
     public void onCreate() {
@@ -38,5 +40,10 @@ public class AwShellApplication extends Application {
         ResourceExtractor.setMandatoryPaksToExtract(MANDATORY_PAKS);
         ResourceExtractor.setExtractImplicitLocaleForTesting(false);
         AwBrowserProcess.loadLibrary();
+
+        if (CommandLine.getInstance().hasSwitch(AwShellSwitches.ENABLE_ATRACE)) {
+            Log.e(TAG, "Enabling Android trace.");
+            TraceEvent.setATraceEnabled(true);
+        }
     }
 }