Remove kSwappedOutURL as it is now unused.

Since swapped out state on RenderFrameHost has been removed, there is
no longer usage of kSwappedOutURL and the code can safely be removed.

BUG=357747

Review URL: https://codereview.chromium.org/1833933002

Cr-Commit-Position: refs/heads/master@{#383398}

6 files changed, 3 insertions, 45 deletions

diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc
index 2e48be5..58bf74a 100644
--- a/chrome/renderer/content_settings_observer.cc
+++ b/chrome/renderer/content_settings_observer.cc
@@ -620,11 +620,6 @@ bool ContentSettingsObserver::IsWhitelistedForContentSettings(
     return true;
 #endif
 
-  // TODO(creis, fsamuel): Remove this once the concept of swapped out
-  // 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 (base::EqualsASCII(protocol, url::kFileScheme)) {
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index e52c354..1173f4f 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2151,11 +2151,6 @@ void RenderProcessHostImpl::FilterURL(RenderProcessHost* rph,
   if (empty_allowed && url->is_empty())
     return;
 
-  // The browser process should never hear the swappedout:// URL from any
-  // of the renderer's messages.  Check for this in debug builds, but don't
-  // let it crash a release browser.
-  DCHECK(GURL(kSwappedOutURL) != *url);
-
   if (!url->is_valid()) {
     // Have to use about:blank for the denied case, instead of an empty GURL.
     // This is because the browser treats navigation to an empty GURL as a
diff --git a/content/public/common/url_constants.cc b/content/public/common/url_constants.cc
index 00bdc87..f3f298c 100644
--- a/content/public/common/url_constants.cc
+++ b/content/public/common/url_constants.cc
@@ -61,9 +61,4 @@ const char kChromeUINetworkViewCacheURL[] = "chrome://view-http-cache/";
 const char kChromeUIResourcesURL[] = "chrome://resources/";
 const char kChromeUIShorthangURL[] = "chrome://shorthang";
 
-// This URL is loaded when a page is swapped out and replaced by a page in a
-// different renderer process.  It must have a unique origin that cannot be
-// scripted by other pages in the process.
-const char kSwappedOutURL[] = "swappedout://";
-
 }  // namespace content
diff --git a/content/public/common/url_constants.h b/content/public/common/url_constants.h
index 42e026a..cb49d5a 100644
--- a/content/public/common/url_constants.h
+++ b/content/public/common/url_constants.h
@@ -70,9 +70,6 @@ CONTENT_EXPORT extern const char kChromeUINetworkViewCacheURL[];
 CONTENT_EXPORT extern const char kChromeUIResourcesURL[];
 CONTENT_EXPORT extern const char kChromeUIShorthangURL[];
 
-// Special URL used to swap out a view being rendered by another process.
-CONTENT_EXPORT extern const char kSwappedOutURL[];
-
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_URL_CONSTANTS_H_
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 8d8d967..e1b14d9 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -329,16 +329,11 @@ WebURLResponseExtraDataImpl* GetExtraDataFromResponse(
 }
 
 void GetRedirectChain(WebDataSource* ds, std::vector<GURL>* result) {
-  // Replace any occurrences of swappedout:// with about:blank.
-  const WebURL& blank_url = GURL(url::kAboutBlankURL);
   WebVector<WebURL> urls;
   ds->redirectChain(urls);
   result->reserve(urls.size());
   for (size_t i = 0; i < urls.size(); ++i) {
-    if (urls[i] != GURL(kSwappedOutURL))
-      result->push_back(urls[i]);
-    else
-      result->push_back(blank_url);
+    result->push_back(urls[i]);
   }
 }
 
@@ -2977,9 +2972,6 @@ void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame,
                "url", ds->request().url().string().utf8());
   DocumentState* document_state = DocumentState::FromDataSource(ds);
 
-  // We should never navigate to swappedout://.
-  CHECK(ds->request().url() != GURL(kSwappedOutURL)) << "Heard swappedout://.";
-
   // Update the request time if WebKit has better knowledge of it.
   if (document_state->request_time().is_null() &&
           triggering_event_time != 0.0) {
@@ -3179,16 +3171,9 @@ void RenderFrameImpl::didCommitProvisionalLoad(
     // We bump our Page ID to correspond with the new session history entry.
     render_view_->page_id_ = render_view_->next_page_id_++;
 
-    // Don't update history list values for kSwappedOutURL, since
-    // we don't want to forget the entry that was there, and since we will
-    // never come back to kSwappedOutURL.  Note that we have to call
-    // SendUpdateState and update page_id_ even in this case, so that
-    // the current entry gets a state update and so that we don't send a
-    // state update to the wrong entry when we swap back in.
     DCHECK(!navigation_state->common_params().should_replace_current_entry ||
            render_view_->history_list_length_ > 0);
-    if (GetLoadingUrl() != GURL(kSwappedOutURL) &&
-        !navigation_state->common_params().should_replace_current_entry) {
+    if (!navigation_state->common_params().should_replace_current_entry) {
       // Advance our offset in session history, applying the length limit.
       // There is now no forward history.
       render_view_->history_list_offset_++;
@@ -4708,8 +4693,7 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
 #ifdef OS_ANDROID
   // The handlenavigation API is deprecated and will be removed once
   // crbug.com/325351 is resolved.
-  if (info.urlRequest.url() != GURL(kSwappedOutURL) &&
-      GetContentClient()->renderer()->HandleNavigation(
+  if (GetContentClient()->renderer()->HandleNavigation(
           this, is_content_initiated, render_view_->opener_id_, frame_,
           info.urlRequest, info.navigationType, info.defaultPolicy,
           is_redirect)) {
@@ -5325,10 +5309,6 @@ void RenderFrameImpl::NavigateInternal(
     scoped_ptr<HistoryEntry> entry =
         PageStateToHistoryEntry(request_params.page_state);
     if (entry) {
-      // Ensure we didn't save the swapped out URL in UpdateState, since the
-      // browser should never be telling us to navigate to swappedout://.
-      CHECK(entry->root().urlString() != kSwappedOutURL);
-
       if (!SiteIsolationPolicy::UseSubframeNavigationEntries()) {
         // By default, tell the HistoryController to go the deserialized
         // HistoryEntry.  This only works if all frames are in the same
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index f7a8df7..e661533 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1501,10 +1501,6 @@ void RenderViewImpl::SendUpdateState() {
   if (!entry)
     return;
 
-  // Don't send state updates for kSwappedOutURL.
-  if (entry->root().urlString() == kSwappedOutURL)
-    return;
-
   Send(new ViewHostMsg_UpdateState(GetRoutingID(), page_id_,
                                    HistoryEntryToPageState(entry)));
 }