Fix missing monochrome resources.

android_webview/browser/aw_browser_main_parts.cc

 // Copyright (c) 2012 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.
 
 #include "android_webview/browser/aw_browser_main_parts.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_content_browser_client.h"
 #include "android_webview/browser/aw_dev_tools_discovery_provider.h"
 #include "android_webview/browser/aw_result_codes.h"
@@ skipping 81 matching lines @@
   DCHECK(!main_message_loop_.get());
   main_message_loop_.reset(new base::MessageLoopForUI);
   base::MessageLoopForUI::current()->Start();
 }
 
 int AwBrowserMainParts::PreCreateThreads() {
   ui::SetLocalePaksStoredInApk(true);
   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());
   DeferredGpuCommandService::SetInstance();
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSingleProcess)) {
     // Create the renderers crash manager on the UI thread.
     breakpad::CrashMicroDumpManager::GetInstance();
   }
 
@@ skipping 11 matching lines @@
   content::RenderFrameHost::AllowInjectingJavaScriptForAndroidWebView();
 }
 
 bool AwBrowserMainParts::MainMessageLoopRun(int* result_code) {
   // Android WebView does not use default MessageLoop. It has its own
   // Android specific MessageLoop.
   return true;
 }
 
 }  // namespace android_webview