Add AwAssets into android_webview/native/public

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_result_codes.h"
-#include "android_webview/native/aw_assets.h"
+#include "android_webview/native/public/aw_assets_utils.h"
 #include "base/android/build_info.h"
 #include "base/android/locale_utils.h"
 #include "base/android/memory_pressure_listener_android.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
 #include "content/public/common/url_utils.h"
@@ skipping 32 matching lines @@
   // TODO(primiano, mkosiba): GetApplicationLocale requires a ResourceBundle
   // instance to be present to work correctly so we call this (knowing it will
   // fail) just to create the ResourceBundle instance. We should refactor
   // ResourceBundle/GetApplicationLocale to not require an instance to be
   // initialized.
   ui::ResourceBundle::InitSharedInstanceWithLocale(
       base::android::GetDefaultLocale(),
       NULL,
       ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
   std::string locale = l10n_util::GetApplicationLocale(std::string()) + ".pak";
-  if (AwAssets::OpenAsset(locale, &pak_fd, &pak_off, &pak_len)) {
+  if (AwAssetsUtils::OpenAsset(locale, &pak_fd, &pak_off, &pak_len)) {
     VLOG(0) << "Load from apk succesful, fd=" << pak_fd << " off=" << pak_off
             << " len=" << pak_len;
     ui::ResourceBundle::CleanupSharedInstance();
     ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
         base::File(pak_fd), base::MemoryMappedFile::Region(pak_off, pak_len));
   } else {
     LOG(WARNING) << "Failed to load " << locale << ".pak from the apk too. "
                     "Bringing up WebView without any locale";
   }
 
   // Try to directly mmap the webviewchromium.pak from the apk. Fall back to
   // load from file, using PATH_SERVICE, otherwise.
-  if (AwAssets::OpenAsset("webviewchromium.pak", &pak_fd, &pak_off, &pak_len)) {
+  if (AwAssetsUtils::OpenAsset("webviewchromium.pak", &pak_fd, &pak_off,
+                               &pak_len)) {
     VLOG(0) << "Loading webviewchromium.pak from, fd:" << pak_fd
             << " off:" << pak_off << " len:" << pak_len;
     ui::ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion(
         base::File(pak_fd),
         base::MemoryMappedFile::Region(pak_off, pak_len),
         ui::SCALE_FACTOR_NONE);
   } else {
     base::FilePath pak_path;
     PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path);
     LOG(WARNING) << "Cannot load webviewchromium.pak assets from the apk. "
@@ skipping 15 matching lines @@
   content::SetMaxURLChars(20 * 1024 * 1024);
 }
 
 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