Merge webviewchromium.pak and resources.pak in Monochrome

ui/base/resource/resource_bundle_android.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 "ui/base/resource/resource_bundle_android.h"
 
 #include "base/android/apk_assets.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
@@ skipping 110 matching lines @@
 }
 
 gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) {
   return GetImageNamed(resource_id);
 }
 
 void SetLocalePaksStoredInApk(bool value) {
   g_locale_paks_in_apk = value;
 }
 
-void LoadMainAndroidPackFile(const char* path_within_apk,
+bool LoadMainAndroidPackFile(const char* path_within_apk,
                              const base::FilePath& disk_file_path) {
   if (LoadFromApkOrFile(path_within_apk,
                         &disk_file_path,
                         &g_resources_pack_fd,
                         &g_resources_pack_region)) {
     ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion(
         base::File(g_resources_pack_fd), g_resources_pack_region,
         SCALE_FACTOR_NONE);
+    return true;
   }
+  return false;
 }
 
 int GetMainAndroidPackFd(base::MemoryMappedFile::Region* out_region) {
   DCHECK_GE(g_resources_pack_fd, 0);
   *out_region = g_resources_pack_region;
   return g_resources_pack_fd;
 }
 
 int GetCommonResourcesPackFd(base::MemoryMappedFile::Region* out_region) {
   DCHECK_GE(g_chrome_100_percent_fd, 0);
@@ skipping 12 matching lines @@
   base::android::ScopedJavaLocalRef<jstring> ret =
       Java_ResourceBundle_getLocalePakResourcePath(
           env, base::android::ConvertUTF8ToJavaString(env, locale).obj());
   if (ret.obj() == nullptr) {
     return std::string();
   }
   return base::android::ConvertJavaStringToUTF8(env, ret.obj());
 }
 
 }  // namespace ui