Remove WebView resource rewriting fallback case.

We no longer build with the Android.mk build system, and so we don't
need the special case to handle it not renaming resources when the APK
package name is renamed.

BUG=447666

Review URL: https://codereview.chromium.org/1040743002

Cr-Commit-Position: refs/heads/master@{#322594}

1 files changed, 3 insertions, 12 deletions

diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
index 965120a..5d3d668 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -322,18 +322,9 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
     }
 
     private void setUpResources(Context context) {
-        try {
-            final String packageName = WebViewFactory.getLoadedPackageInfo().packageName;
-            ResourceRewriter.rewriteRValues(
-                    mWebViewDelegate.getPackageId(context.getResources(), packageName));
-        } catch (RuntimeException e) {
-            // TODO(torne): remove this when we're no longer using the Android build system.
-            // The Android.mk-based build uses a different resources package name than the
-            // ninja-based build: the resources are always called com.android.webview even if the
-            // manifest has had the package renamed.
-            ResourceRewriter.rewriteRValues(
-                    mWebViewDelegate.getPackageId(context.getResources(), "com.android.webview"));
-        }
+        final String packageName = WebViewFactory.getLoadedPackageInfo().packageName;
+        ResourceRewriter.rewriteRValues(
+                mWebViewDelegate.getPackageId(context.getResources(), packageName));
 
         AwResource.setResources(context.getResources());
         AwResource.setErrorPageResources(android.R.raw.loaderror, android.R.raw.nodomain);