Android resource PAKs and native lib file path changes.

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 <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 183 matching lines @@
 }
 
 #if !defined(OS_MACOSX)
 FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale,
                                            bool test_file_exists) {
   if (app_locale.empty())
     return FilePath();
 
   FilePath locale_file_path;
 
-#if defined(OS_ANDROID)
-  PathService::Get(base::DIR_ANDROID_APP_DATA, &locale_file_path);
-  locale_file_path = locale_file_path.Append(FILE_PATH_LITERAL("paks"));
-#else
   PathService::Get(ui::DIR_LOCALES, &locale_file_path);
-#endif
 
   if (!locale_file_path.empty())
     locale_file_path = locale_file_path.AppendASCII(app_locale + ".pak");
 
   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.
@@ skipping 357 matching lines @@
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, 32, 32);
     bitmap.allocPixels();
     bitmap.eraseARGB(255, 255, 0, 0);
     empty_image_ = gfx::Image(bitmap);
   }
   return empty_image_;
 }
 
 }  // namespace ui