| Index: android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java | 
| diff --git a/android_webview/shell_apk/src/org/chromium/android_webview/shell/AndroidWebViewTestShellApplication.java b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java | 
| similarity index 83% | 
| rename from android_webview/shell_apk/src/org/chromium/android_webview/shell/AndroidWebViewTestShellApplication.java | 
| rename to android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java | 
| index 44e64c2c90e92bb915273c1419b9115e82bd5333..585e9d9c04f9ef655a5a2ef1d1ebbbd73140f85c 100644 | 
| --- a/android_webview/shell_apk/src/org/chromium/android_webview/shell/AndroidWebViewTestShellApplication.java | 
| +++ b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellApplication.java | 
| @@ -8,11 +8,10 @@ import android.app.Application; | 
| import android.content.Context; | 
|  | 
| import org.chromium.android_webview.AwBrowserProcess; | 
| -import org.chromium.android_webview.test.AwTestResourceProvider; | 
| import org.chromium.content.browser.ResourceExtractor; | 
| import org.chromium.content.common.CommandLine; | 
|  | 
| -public class AndroidWebViewTestShellApplication extends Application { | 
| +public class AwShellApplication extends Application { | 
|  | 
| /** The minimum set of .pak files the test runner needs. */ | 
| private static final String[] MANDATORY_PAKS = { | 
| @@ -23,7 +22,7 @@ public class AndroidWebViewTestShellApplication extends Application { | 
| public void onCreate() { | 
| super.onCreate(); | 
|  | 
| -        AwTestResourceProvider.registerResources(this); | 
| +        AwShellResourceProvider.registerResources(this); | 
|  | 
| CommandLine.initFromFile("/data/local/chrome-command-line"); | 
|  | 
|  |