Android: Add version suffix to extracted .pak files

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 <stdint.h>
 
 #include <limits>
 #include <utility>
@@ skipping 26 matching lines @@
 #include "ui/display/screen.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/strings/grit/app_locale_settings.h"
 
 #if defined(OS_ANDROID)
+#include "base/android/build_info.h"
 #include "ui/base/resource/resource_bundle_android.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "ui/gfx/platform_font_linux.h"
 #endif
 
 #if defined(OS_WIN)
 #include "ui/display/win/dpi.h"
 #endif
 
 namespace ui {
 
 namespace {
 
 // PNG-related constants.
 const unsigned char kPngMagic[8] = { 0x89, 'P', 'N', 'G', 13, 10, 26, 10 };
 const size_t kPngChunkMetadataSize = 12;  // length, type, crc32
 const unsigned char kPngScaleChunkType[4] = { 'c', 's', 'C', 'l' };
 const unsigned char kPngDataChunkType[4] = { 'I', 'D', 'A', 'T' };
 
 #if !defined(OS_MACOSX)
-const char kPakFileSuffix[] = ".pak";
+const char kPakFileExtension[] = ".pak";
 #endif
 
 ResourceBundle* g_shared_instance_ = NULL;
 
 #if defined(OS_ANDROID)
 // Returns the scale factor closest to |scale| from the full list of factors.
 // Note that it does NOT rely on the list of supported scale factors.
 // Finding the closest match is inefficient and shouldn't be done frequently.
 ScaleFactor FindClosestScaleFactorUnsafe(float scale) {
   float smallest_diff =  std::numeric_limits<float>::max();
@@ skipping 217 matching lines @@
 base::FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale,
                                                  bool test_file_exists) {
   if (app_locale.empty())
     return base::FilePath();
 
   base::FilePath locale_file_path;
 
   PathService::Get(ui::DIR_LOCALES, &locale_file_path);
 
   if (!locale_file_path.empty()) {
+#if defined(OS_ANDROID)
+    if (locale_file_path.value().find("chromium_tests") == std::string::npos) {

[agrieve, 2017/04/20 15:54:38]

Note: Although ugly, it's actually already the case that we special-case .pak
loading for tests:
https://cs.chromium.org/chromium/src/ui/base/resource/resource_bundle_android...

I plan to look at removing the special-casing as a follow-up, but wanted to keep
this change as small as possible for potential release cherry-picking.

+      std::string extracted_file_suffix =
+          base::android::BuildInfo::GetInstance()->extracted_file_suffix();
+      locale_file_path = locale_file_path.AppendASCII(
+          app_locale + kPakFileExtension + extracted_file_suffix);
+    } else {
+      // TODO(agrieve): Update tests to not side-load pak files and remove
+      //     this special-case. https://crbug.com/691719
+      locale_file_path =
+          locale_file_path.AppendASCII(app_locale + kPakFileExtension);
+    }
+#else
     locale_file_path =
-        locale_file_path.AppendASCII(app_locale + kPakFileSuffix);
+        locale_file_path.AppendASCII(app_locale + kPakFileExtension);
+#endif
   }
 
   if (delegate_) {
     locale_file_path =
         delegate_->GetPathForLocalePack(locale_file_path, app_locale);
   }
 
   // Don't try to load empty values or values that are not absolute paths.
   if (locale_file_path.empty() || !locale_file_path.IsAbsolute())
     return base::FilePath();
@@ skipping 590 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