Remove logic for lazy initialization of WebKit.

chrome/renderer/chrome_render_process_observer.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 "chrome/renderer/chrome_render_process_observer.h"
 
 #include <stddef.h>
 #include <limits>
 #include <set>
 #include <utility>
@@ skipping 165 matching lines @@
       const mojo::Callback<void(ResourceUsageDataPtr)>& callback) override {
     DCHECK(callback_.is_null());
     weak_factory_.InvalidateWeakPtrs();
     usage_data_ = ResourceUsageData::New();
     usage_data_->reports_v8_stats = true;
     callback_ = callback;
 
     // Since it is not safe to call any Blink or V8 functions until Blink has
     // been initialized (which also initializes V8), early out and send 0 back
     // for all resources.
-    if (!observer_ || !observer_->webkit_initialized()) {
+    if (!observer_) {
       SendResults();
       return;
     }
 
     WebCache::ResourceTypeStats stats;
     WebCache::getResourceTypeStats(&stats);
     usage_data_->web_cache_stats = ResourceTypeStats::From(stats);
 
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     if (isolate) {
@@ skipping 34 matching lines @@
     base::WeakPtr<ChromeRenderProcessObserver> observer,
     mojo::InterfaceRequest<ResourceUsageReporter> request) {
   new ResourceUsageReporterImpl(observer, std::move(request));
 }
 
 }  // namespace
 
 bool ChromeRenderProcessObserver::is_incognito_process_ = false;
 
 ChromeRenderProcessObserver::ChromeRenderProcessObserver()
-    : webkit_initialized_(false), weak_factory_(this) {
+    : weak_factory_(this) {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 
 #if defined(ENABLE_AUTOFILL_DIALOG)
   WebRuntimeFeatures::enableRequestAutocomplete(true);
 #endif
 
   if (command_line.HasSwitch(switches::kDisableJavaScriptHarmonyShipping)) {
     std::string flag("--noharmony-shipping");
     v8::V8::SetFlagsFromString(flag.c_str(), static_cast<int>(flag.size()));
@@ skipping 15 matching lines @@
 
   thread->GetServiceRegistry()->AddService<ResourceUsageReporter>(
       base::Bind(CreateResourceUsageReporter, weak_factory_.GetWeakPtr()));
 
   // Configure modules that need access to resources.
   net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider);
   media::SetLocalizedStringProvider(
       chrome_common_media::LocalizedStringProvider);
 
   InitFieldTrialObserving(command_line);
+
+  // chrome-native: is a scheme used for placeholder navigations that allow
+  // UIs to be drawn with platform native widgets instead of HTML.  These pages
+  // should not be accessible, and should also be treated as empty documents
+  // that can commit synchronously.  No code should be runnable in these pages,
+  // so it should not need to access anything nor should it allow javascript
+  // URLs since it should never be visible to the user.
+  WebString native_scheme(base::ASCIIToUTF16(chrome::kChromeNativeScheme));
+  WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(native_scheme);
+  WebSecurityPolicy::registerURLSchemeAsEmptyDocument(native_scheme);
+  WebSecurityPolicy::registerURLSchemeAsNoAccess(native_scheme);
+  WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs(
+      native_scheme);
 }
 
 ChromeRenderProcessObserver::~ChromeRenderProcessObserver() {}
 
 void ChromeRenderProcessObserver::InitFieldTrialObserving(
     const base::CommandLine& command_line) {
   // Set up initial set of crash dump data for field trials in this renderer.
   variations::SetVariationListCrashKeys();
 
   // Listen for field trial activations to report them to the browser.
@@ skipping 26 matching lines @@
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SetIsIncognitoProcess,
                         OnSetIsIncognitoProcess)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SetFieldTrialGroup, OnSetFieldTrialGroup)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SetContentSettingRules,
                         OnSetContentSettingRules)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void ChromeRenderProcessObserver::WebKitInitialized() {
-  webkit_initialized_ = true;
-  // chrome-native: is a scheme used for placeholder navigations that allow
-  // UIs to be drawn with platform native widgets instead of HTML.  These pages
-  // should not be accessible, and should also be treated as empty documents
-  // that can commit synchronously.  No code should be runnable in these pages,
-  // so it should not need to access anything nor should it allow javascript
-  // URLs since it should never be visible to the user.
-  WebString native_scheme(base::ASCIIToUTF16(chrome::kChromeNativeScheme));
-  WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(native_scheme);
-  WebSecurityPolicy::registerURLSchemeAsEmptyDocument(native_scheme);
-  WebSecurityPolicy::registerURLSchemeAsNoAccess(native_scheme);
-  WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs(
-      native_scheme);
-}
-
-void ChromeRenderProcessObserver::OnRenderProcessShutdown() {
-  webkit_initialized_ = false;
-}
-
 void ChromeRenderProcessObserver::OnSetIsIncognitoProcess(
     bool is_incognito_process) {
   is_incognito_process_ = is_incognito_process;
 }
 
 void ChromeRenderProcessObserver::OnSetContentSettingRules(
     const RendererContentSettingRules& rules) {
   content_setting_rules_ = rules;
 }
 
@@ skipping 37 matching lines @@
 ChromeRenderProcessObserver::content_setting_rules() const {
   return &content_setting_rules_;
 }
 
 void ChromeRenderProcessObserver::OnFieldTrialGroupFinalized(
     const std::string& trial_name,
     const std::string& group_name) {
   content::RenderThread::Get()->Send(
       new ChromeViewHostMsg_FieldTrialActivated(trial_name));
 }