Remove swapped-out usage in --site-per-process.

chrome/renderer/content_settings_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/content_settings_observer.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "components/content_settings/content/common/content_settings_messages.h"
 #include "content/public/common/url_constants.h"
@@ skipping 152 matching lines @@
       allow_displaying_insecure_content_(false),
       allow_running_insecure_content_(false),
       content_setting_rules_(NULL),
       is_interstitial_page_(false),
       npapi_plugins_blocked_(false),
       current_request_id_(0),
       should_whitelist_(should_whitelist) {
   ClearBlockedContentSettings();
   render_frame->GetWebFrame()->setContentSettingsClient(this);
 
-  if (render_frame->GetRenderView()->GetMainRenderFrame() != render_frame) {
+  content::RenderFrame* main_frame =
+      render_frame->GetRenderView()->GetMainRenderFrame();
+  if (main_frame && main_frame != render_frame) {
     // Copy all the settings from the main render frame to avoid race conditions
     // when initializing this data. See http://crbug.com/333308.

[Charlie Reis, 2015/06/04 00:02:11]

Unrelated: Will this bug regress for OOPIFs, since they won't find the main
frame?  I wonder if we should file a OOPIF bug for it.

[nasko, 2015/06/04 14:57:12]

I think it deserves a bug and attention, as with OOPIF we aren't guaranteed a
main frame in the process. Filed crbug.com/496670 to ensure we don't lose track
of this.

-    ContentSettingsObserver* parent = ContentSettingsObserver::Get(
-        render_frame->GetRenderView()->GetMainRenderFrame());
+    ContentSettingsObserver* parent = ContentSettingsObserver::Get(main_frame);
     allow_displaying_insecure_content_ =
         parent->allow_displaying_insecure_content_;
     allow_running_insecure_content_ = parent->allow_running_insecure_content_;
     temporarily_allowed_plugins_ = parent->temporarily_allowed_plugins_;
     is_interstitial_page_ = parent->is_interstitial_page_;
     npapi_plugins_blocked_ = parent->npapi_plugins_blocked_;
   }
 }
 
 ContentSettingsObserver::~ContentSettingsObserver() {
@@ skipping 509 matching lines @@
     return true;  // Browser UI elements should still work.
 
   if (EqualsASCII(origin.protocol(), content::kChromeDevToolsScheme))
     return true;  // DevTools UI elements should still work.
 
 #if defined(ENABLE_EXTENSIONS)
   if (EqualsASCII(origin.protocol(), extensions::kExtensionScheme))
     return true;
 #endif
 
   // TODO(creis, fsamuel): Remove this once the concept of swapped out

[Charlie Reis, 2015/06/04 00:02:11]

Ooh, just saw this as I was scrolling through.  :)  Soon!

[nasko, 2015/06/04 14:57:12]

Acknowledged.

   // RenderFrames goes away.
   if (document_url == GURL(content::kSwappedOutURL))
     return true;
 
   // If the scheme is file:, an empty file name indicates a directory listing,
   // which requires JavaScript to function properly.
   if (EqualsASCII(origin.protocol(), url::kFileScheme)) {
     return document_url.SchemeIs(url::kFileScheme) &&
            document_url.ExtractFileName().empty();
   }
 
   return false;
 }