Enable components_browsertests on Android

components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsApplication.java

Index: components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsApplication.java
diff --git a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsApplication.java b/components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsApplication.java
similarity index 62%
copy from content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsApplication.java
copy to components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsApplication.java
index 92c65375c186b68412e4510ad08f0e233750ee57..e090f22565837e35927c531871d98d389da95b99 100644
--- a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsApplication.java
+++ b/components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsApplication.java
@@ -1,8 +1,8 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.content_browsertests_apk;
+package org.chromium.components_browsertests_apk;
 
 import org.chromium.base.BaseChromiumApplication;
 import org.chromium.base.PathUtils;
@@ -11,15 +11,11 @@ import org.chromium.base.ResourceExtractor;
 /**
  * A basic content browser tests {@link android.app.Application}.
  */
-public class ContentBrowserTestsApplication extends BaseChromiumApplication {
-
-    private static final String[] MANDATORY_PAK_FILES = new String[] {
-        "content_shell.pak",
-        "icudtl.dat",
-        "natives_blob.bin",
-        "snapshot_blob.bin"
-    };
-    private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "content_shell";
+public class ComponentsBrowserTestsApplication extends BaseChromiumApplication {
+    private static final String[] MANDATORY_PAK_FILES =
+            new String[] {"components_tests_resources.pak", "content_shell.pak", "icudtl.dat",
+                    "natives_blob.bin", "snapshot_blob.bin"};
+    private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "components_shell";
 
     @Override
     public void onCreate() {
@@ -31,5 +27,4 @@ public class ContentBrowserTestsApplication extends BaseChromiumApplication {
         ResourceExtractor.setMandatoryPaksToExtract(MANDATORY_PAK_FILES);
         PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX);
     }
-
 }