Revert of Remove about:srcdoc url conversion.

chrome/browser/extensions/api/web_navigation/frame_navigation_state.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/browser/extensions/api/web_navigation/frame_navigation_state.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/render_frame_host.h"
@@ skipping 12 matching lines @@
     url::kFtpScheme,
     url::kJavaScriptScheme,
     url::kDataScheme,
     url::kFileSystemScheme,
 };
 
 }  // namespace
 
 FrameNavigationState::FrameState::FrameState() {
   error_occurred = false;
+  is_iframe_srcdoc = false;
   is_loading = false;
   is_parsing = false;
 }
 
 // static
 bool FrameNavigationState::allow_extension_scheme_ = false;
 
 FrameNavigationState::FrameNavigationState() {
 }
 
@@ skipping 20 matching lines @@
   if (it == frame_host_state_map_.end() || it->second.error_occurred) {
     return false;
   }
   return IsValidUrl(it->second.url);
 }
 
 void FrameNavigationState::StartTrackingDocumentLoad(
     content::RenderFrameHost* frame_host,
     const GURL& url,
     bool is_same_page,
-    bool is_error_page) {
+    bool is_error_page,
+    bool is_iframe_srcdoc) {
   FrameState& frame_state = frame_host_state_map_[frame_host];
   frame_state.error_occurred = is_error_page;
   frame_state.url = url;
+  frame_state.is_iframe_srcdoc = is_iframe_srcdoc;
+  DCHECK(!is_iframe_srcdoc || url == url::kAboutBlankURL);
   if (!is_same_page) {
     frame_state.is_loading = true;
     frame_state.is_parsing = true;
   }
 }
 
 void FrameNavigationState::FrameHostCreated(
     content::RenderFrameHost* frame_host) {
   frame_hosts_.insert(frame_host);
 }
@@ skipping 18 matching lines @@
     content::RenderFrameHost* frame_host) const {
   return frame_host_state_map_.find(frame_host) != frame_host_state_map_.end();
 }
 
 GURL FrameNavigationState::GetUrl(content::RenderFrameHost* frame_host) const {
   FrameHostToStateMap::const_iterator it =
       frame_host_state_map_.find(frame_host);
   if (it == frame_host_state_map_.end())
     return GURL();
 
+  if (it->second.is_iframe_srcdoc)
+    return GURL(content::kAboutSrcDocURL);
   return it->second.url;
 }
 
 void FrameNavigationState::SetErrorOccurredInFrame(
     content::RenderFrameHost* frame_host) {
   FrameHostToStateMap::iterator it = frame_host_state_map_.find(frame_host);
   if (it == frame_host_state_map_.end()) {
     NOTREACHED();
     return;
   }
@@ skipping 38 matching lines @@
 
 bool FrameNavigationState::GetParsingFinished(
     content::RenderFrameHost* frame_host) const {
   FrameHostToStateMap::const_iterator it =
       frame_host_state_map_.find(frame_host);
   DCHECK(it != frame_host_state_map_.end());
   return it == frame_host_state_map_.end() || !it->second.is_parsing;
 }
 
 }  // namespace extensions