Revert https://src.chromium.org/viewvc/chrome?view=rev&revision=283728

As of https://src.chromium.org/viewvc/blink?view=rev&revision=179240, Blink
no longer implements the behaviour that corresponds to this change.  Everything
is handled blink-side, so remove this support.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287611 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 0 insertions, 69 deletions

diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index 71b810b..5d53246 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -1175,17 +1175,6 @@ void ViewSource(Browser* browser, WebContents* contents) {
   if (!entry)
     return;
 
-  // The URL "data:," is a special case, since Blink uses it when it wants to
-  // show a "blocked page" from its reflected XSS filter. When the XSS filter
-  // triggers, the current entry gets marked as containing an XSS, and then a
-  // new navigation to "data:," occurs on top of it. Showing that page in place
-  // of the "data:," URL permits examination of the cause of the reflection.
-  if (entry->GetURL() == GURL("data:,")) {
-    NavigationEntry* previous = contents->GetController().GetEntryAtOffset(-1);
-    if (previous && previous->GetXssDetected())
-      entry = previous;
-  }
-
   ViewSource(browser, contents, entry->GetURL(), entry->GetPageState());
 }
 
diff --git a/content/browser/frame_host/navigation_entry_impl.cc b/content/browser/frame_host/navigation_entry_impl.cc
index 5f82ea5..b021d5e 100644
--- a/content/browser/frame_host/navigation_entry_impl.cc
+++ b/content/browser/frame_host/navigation_entry_impl.cc
@@ -53,7 +53,6 @@ NavigationEntryImpl::NavigationEntryImpl()
       should_replace_entry_(false),
       should_clear_history_list_(false),
       can_load_local_resources_(false),
-      xss_detected_(false),
       frame_tree_node_id_(-1) {
 }
 
@@ -83,7 +82,6 @@ NavigationEntryImpl::NavigationEntryImpl(SiteInstanceImpl* instance,
       should_replace_entry_(false),
       should_clear_history_list_(false),
       can_load_local_resources_(false),
-      xss_detected_(false),
       frame_tree_node_id_(-1) {
 }
 
@@ -312,10 +310,6 @@ bool NavigationEntryImpl::GetCanLoadLocalResources() const {
   return can_load_local_resources_;
 }
 
-bool NavigationEntryImpl::GetXssDetected() const {
-  return xss_detected_;
-}
-
 void NavigationEntryImpl::SetFrameToNavigate(const std::string& frame_name) {
   frame_to_navigate_ = frame_name;
 }
diff --git a/content/browser/frame_host/navigation_entry_impl.h b/content/browser/frame_host/navigation_entry_impl.h
index c162d22..613f45e 100644
--- a/content/browser/frame_host/navigation_entry_impl.h
+++ b/content/browser/frame_host/navigation_entry_impl.h
@@ -89,7 +89,6 @@ class CONTENT_EXPORT NavigationEntryImpl
   virtual void SetRedirectChain(const std::vector<GURL>& redirects) OVERRIDE;
   virtual const std::vector<GURL>& GetRedirectChain() const OVERRIDE;
   virtual bool IsRestored() const OVERRIDE;
-  virtual bool GetXssDetected() const OVERRIDE;
 
   // Once a navigation entry is committed, we should no longer track several
   // pieces of non-persisted state, as documented on the members below.
@@ -219,12 +218,6 @@ class CONTENT_EXPORT NavigationEntryImpl
     frame_tree_node_id_ = frame_tree_node_id;
   }
 
-  // Called when an XSS detected by Blink's XSSAuditor caused the page to
-  // be blocked.
-  void set_xss_detected(bool xss_detected) {
-    xss_detected_ = xss_detected;
-  }
-
  private:
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
   // Session/Tab restore save portions of this class so that it can be recreated
@@ -329,10 +322,6 @@ class CONTENT_EXPORT NavigationEntryImpl
   // value is not needed after the entry commits and is not persisted.
   bool can_load_local_resources_;
 
-  // Set when this entry was blocked by Blink's XSSAuditor.
-  // TODO(tsepez): persist xss_detected_ (see WARNING section above).
-  bool xss_detected_;
-
   // If not empty, the name of the frame to navigate. This field is not
   // persisted, because it is currently only used in tests.
   std::string frame_to_navigate_;
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 9c40100..551e16a 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -552,7 +552,6 @@ bool WebContentsImpl::OnMessageReceived(RenderViewHost* render_view_host,
                         OnDomOperationResponse)
     IPC_MESSAGE_HANDLER(FrameHostMsg_DidChangeThemeColor,
                         OnThemeColorChanged)
-    IPC_MESSAGE_HANDLER(FrameHostMsg_DidDetectXSS, OnDidDetectXSS)
     IPC_MESSAGE_HANDLER(FrameHostMsg_DidFinishDocumentLoad,
                         OnDocumentLoadedInFrame)
     IPC_MESSAGE_HANDLER(FrameHostMsg_DidFinishLoad, OnDidFinishLoad)
@@ -2678,26 +2677,6 @@ void WebContentsImpl::OnDidRunInsecureContent(
       GetController().GetBrowserContext());
 }
 
-
-void WebContentsImpl::OnDidDetectXSS(int32 page_id,
-                                     const GURL& url,
-                                     bool blocked_entire_page) {
-  if (!blocked_entire_page)
-    return;
-
-  int entry_index = controller_.GetEntryIndexWithPageID(
-      GetRenderViewHost()->GetSiteInstance(), page_id);
-  if (entry_index < 0)
-    return;
-
-  NavigationEntryImpl* entry = NavigationEntryImpl::FromNavigationEntry(
-      controller_.GetEntryAtIndex(entry_index));
-  if (!entry)
-    return;
-
-  entry->set_xss_detected(true);
-}
-
 void WebContentsImpl::OnDocumentLoadedInFrame() {
   CHECK(render_frame_message_source_);
   CHECK(!render_view_message_source_);
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index aee4309..b944ea1 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -740,7 +740,6 @@ class CONTENT_EXPORT WebContentsImpl
   void OnDidDisplayInsecureContent();
   void OnDidRunInsecureContent(const std::string& security_origin,
                                const GURL& target_url);
-  void OnDidDetectXSS(int32 page_id, const GURL& url, bool blocked_entire_page);
   void OnDocumentLoadedInFrame();
   void OnDidFinishLoad(const GURL& url);
   void OnDidStartLoading(bool to_different_document);
diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h
index a28b7dd..b66858d 100644
--- a/content/common/frame_messages.h
+++ b/content/common/frame_messages.h
@@ -606,12 +606,6 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_ForwardInputEvent,
 // user right clicked.
 IPC_MESSAGE_ROUTED1(FrameHostMsg_ContextMenu, content::ContextMenuParams)
 
-// Sent when the renderer detects an XSS in a page.
-IPC_MESSAGE_ROUTED3(FrameHostMsg_DidDetectXSS,
-                    int32  /* page_id */,
-                    GURL  /* url */,
-                    bool  /* blocked entire page */)
-
 // Initial drawing parameters for a child frame that has been swapped out to
 // another process.
 IPC_MESSAGE_ROUTED2(FrameHostMsg_InitializeChildFrame,
diff --git a/content/public/browser/navigation_entry.h b/content/public/browser/navigation_entry.h
index 11b5c0f..6d69b0d 100644
--- a/content/public/browser/navigation_entry.h
+++ b/content/public/browser/navigation_entry.h
@@ -217,9 +217,6 @@ class NavigationEntry {
 
   // True if this entry is restored and hasn't been loaded.
   virtual bool IsRestored() const = 0;
-
-  // Whether an XSS was detected by Blink's XSSAuditor for this entry.
-  virtual bool GetXssDetected() const = 0;
 };
 
 }  // namespace content
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 732b914..45af122 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2680,13 +2680,6 @@ void RenderFrameImpl::didRunInsecureContent(
       target));
 }
 
-void RenderFrameImpl::didDetectXSS(blink::WebLocalFrame* frame,
-                                  const blink::WebURL& url,
-                                  bool blocked_entire_page) {
-  Send(new FrameHostMsg_DidDetectXSS(routing_id_, render_view_->page_id_, url,
-                                     blocked_entire_page));
-}
-
 void RenderFrameImpl::didAbortLoading(blink::WebLocalFrame* frame) {
   DCHECK(!frame_ || frame_ == frame);
 #if defined(ENABLE_PLUGINS)
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 10adcda..32c68f4 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -370,9 +370,6 @@ class CONTENT_EXPORT RenderFrameImpl
   virtual void didRunInsecureContent(blink::WebLocalFrame* frame,
                                      const blink::WebSecurityOrigin& origin,
                                      const blink::WebURL& target);
-  virtual void didDetectXSS(blink::WebLocalFrame* frame,
-                            const blink::WebURL& url,
-                            bool blocked_entire_page);
   virtual void didAbortLoading(blink::WebLocalFrame* frame);
   virtual void didCreateScriptContext(blink::WebLocalFrame* frame,
                                       v8::Handle<v8::Context> context,