Files required by a service now listed in manifest.

android_webview/lib/main/aw_main_delegate.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/lib/main/aw_main_delegate.h"
 
 #include <memory>
 
 #include "android_webview/browser/aw_content_browser_client.h"
 #include "android_webview/browser/aw_safe_browsing_config_helper.h"
@@ skipping 19 matching lines @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
 #include "cc/base/switches.h"
 #include "components/crash/content/app/breakpad_linux.h"
 #include "components/safe_browsing_db/android/safe_browsing_api_handler_bridge.h"
 #include "components/spellcheck/common/spellcheck_features.h"
 #include "content/public/browser/android/browser_media_player_manager_register.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/common/content_descriptors.h"
+#include "content/public/common/content_descriptor_keys.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "gin/public/isolate_holder.h"
 #include "gin/v8_initializer.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/ipc/gl_in_process_context.h"
 #include "media/base/media_switches.h"
 #include "media/media_features.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
@@ skipping 74 matching lines @@
 
     content::RegisterMediaUrlInterceptor(new AwMediaUrlInterceptor());
     BrowserViewRenderer::CalculateTileMemoryPolicy();
     // WebView apps can override WebView#computeScroll to achieve custom
     // scroll/fling. As a result, fling animations may not be ticked,
     // potentially
     // confusing the tap suppression controller. Simply disable it for WebView
     ui::GestureConfiguration::GetInstance()
         ->set_fling_touchscreen_tap_suppression_enabled(false);
 
-    base::android::RegisterApkAssetWithGlobalDescriptors(
-        kV8NativesDataDescriptor,
-        gin::V8Initializer::GetNativesFilePath().AsUTF8Unsafe());
-    base::android::RegisterApkAssetWithGlobalDescriptors(
-        kV8SnapshotDataDescriptor32,
-        gin::V8Initializer::GetSnapshotFilePath(true).AsUTF8Unsafe());
-    base::android::RegisterApkAssetWithGlobalDescriptors(
-        kV8SnapshotDataDescriptor64,
-        gin::V8Initializer::GetSnapshotFilePath(false).AsUTF8Unsafe());
+    base::android::RegisterApkAssetWithFileDescriptorStore(
+        content::kV8NativesDataDescriptor,
+        gin::V8Initializer::GetNativesFilePath());
+    base::android::RegisterApkAssetWithFileDescriptorStore(
+        content::kV8Snapshot32DataDescriptor,
+        gin::V8Initializer::GetSnapshotFilePath(true));
+    base::android::RegisterApkAssetWithFileDescriptorStore(
+        content::kV8Snapshot64DataDescriptor,
+        gin::V8Initializer::GetSnapshotFilePath(false));
   }
 #endif  // V8_USE_EXTERNAL_STARTUP_DATA
 
   if (cl->HasSwitch(switches::kWebViewSandboxedRenderer)) {
     cl->AppendSwitch(switches::kInProcessGPU);
     cl->AppendSwitchASCII(switches::kRendererProcessLimit, "1");
     cl->AppendSwitch(switches::kDisableRendererPriorityManagement);
   }
 
   CommandLineHelper::AddEnabledFeature(
@@ skipping 126 matching lines @@
 
 AwWebPreferencesPopulater* AwMainDelegate::CreateWebPreferencesPopulater() {
   return new AwWebPreferencesPopulaterImpl();
 }
 
 AwLocaleManager* AwMainDelegate::CreateAwLocaleManager() {
   return new AwLocaleManagerImpl();
 }
 
 }  // namespace android_webview