Fix missing monochrome resources.

android_webview/browser/aw_browser_main_parts.cc

Index: android_webview/browser/aw_browser_main_parts.cc
diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc
index 56c9374ab49f79902a0aebce5709dd96758cfc8d..769fcf4f1809914af4c08429e6271ae365f3e8a7 100644
--- a/android_webview/browser/aw_browser_main_parts.cc
+++ b/android_webview/browser/aw_browser_main_parts.cc
@@ -99,27 +99,19 @@ int AwBrowserMainParts::PreCreateThreads() {
   std::string locale = ui::ResourceBundle::InitSharedInstanceWithLocale(
       base::android::GetDefaultLocale(),
       NULL,
-      ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
+      ui::ResourceBundle::LOAD_COMMON_RESOURCES);
   if (locale.empty()) {
     LOG(WARNING) << "Failed to load locale .pak from the apk. "
         "Bringing up WebView without any locale";
   }
   base::i18n::SetICUDefaultLocale(locale);
 
-  // Try to directly mmap the webviewchromium.pak from the apk. Fall back to
-  // load from file, using PATH_SERVICE, otherwise.
-  base::FilePath base_pak_file_path;
-  PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &base_pak_file_path);
-  // If Webview is a separate APK from Chrome then it uses webviewchromium.pak
-  base::FilePath webview_pak_file_path = base_pak_file_path.AppendASCII(
-      "webviewchromium.pak");
-  if (!ui::LoadMainAndroidPackFile("assets/webviewchromium.pak",
-      webview_pak_file_path)) {
-    // If it the same APK as Chrome (Monochrome) then it shares resources.pak
-    base::FilePath chromium_pak_file_path = base_pak_file_path.AppendASCII(
-        "resources.pak");
-    ui::LoadMainAndroidPackFile("assets/resources.pak", chromium_pak_file_path);
-  }
+  // Try to directly mmap the resources.pak from the apk. Fall back to load
+  // from file, using PATH_SERVICE, otherwise.
+  base::FilePath pak_file_path;
+  PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_file_path);
+  pak_file_path = pak_file_path.AppendASCII("resources.pak");
+  ui::LoadMainAndroidPackFile("assets/resources.pak", pak_file_path);
 
   base::android::MemoryPressureListenerAndroid::RegisterSystemCallback(
       base::android::AttachCurrentThread());