Convert Android WebView to store locale .pak files as res/raw resources

ui/base/resource/resource_bundle.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.h"
 
 #include <limits>
 #include <vector>
 
 #include "base/big_endian.h"
@@ skipping 181 matching lines @@
 }
 
 // static
 ResourceBundle& ResourceBundle::GetSharedInstance() {
   // Must call InitSharedInstance before this function.
   CHECK(g_shared_instance_ != NULL);
   return *g_shared_instance_;
 }
 
 bool ResourceBundle::LocaleDataPakExists(const std::string& locale) {
-  bool locale_file_path_exists = !GetLocaleFilePath(locale, true).empty();
 #if defined(OS_ANDROID)
-  // TODO(mkosiba,primiano): Chrome should mmap the .pak files too, in which
-  // case we'd not need to check if locale_file_path_exists here.
-  // http://crbug.com/394502.
-  return locale_file_path_exists ||
-      AssetContainedInApk(locale + kPakFileSuffix);
-#else
-  return locale_file_path_exists;
+  if (!GetPathForAndroidLocalePakWithinApk(locale).empty()) {
+    return true;
+  }
 #endif
+  return !GetLocaleFilePath(locale, true).empty();
 }
 
 void ResourceBundle::AddDataPackFromPath(const base::FilePath& path,
                                          ScaleFactor scale_factor) {
   AddDataPackFromPathInternal(path, scale_factor, false);
 }
 
 void ResourceBundle::AddOptionalDataPackFromPath(const base::FilePath& path,
                                          ScaleFactor scale_factor) {
   AddDataPackFromPathInternal(path, scale_factor, true);
@@ skipping 635 matching lines @@
 // static
 bool ResourceBundle::DecodePNG(const unsigned char* buf,
                                size_t size,
                                SkBitmap* bitmap,
                                bool* fell_back_to_1x) {
   *fell_back_to_1x = PNGContainsFallbackMarker(buf, size);
   return gfx::PNGCodec::Decode(buf, size, bitmap);
 }
 
 }  // namespace ui