Remove WebView resource rewriting fallback case.

android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java

 // Copyright 2014 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 com.android.webview.chromium;
 
 import android.app.ActivityManager;
 import android.content.ComponentCallbacks2;
 import android.content.Context;
 import android.content.Intent;
@@ skipping 304 matching lines @@
                     "Toggling of Web Contents Debugging must be done on the UI thread");
         }
         if (mDevToolsServer == null) {
             if (!enable) return;
             mDevToolsServer = new AwDevToolsServer();
         }
         mDevToolsServer.setRemoteDebuggingEnabled(enable);
     }
 
     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);
         AwResource.setConfigKeySystemUuidMapping(android.R.array.config_keySystemUuidMapping);
     }
 
     @Override
     public Statics getStatics() {
         synchronized (mLock) {
             if (mStaticMethods == null) {
@@ skipping 124 matching lines @@
                         browserContext.getHttpAuthDatabase(context));
             }
         }
         return mWebViewDatabase;
     }
 
     WebViewDelegate getWebViewDelegate() {
         return mWebViewDelegate;
     }
 }