Take out the is_content_filtered bool that gets passed around betwen renderer/browser and WebKit, since it's not used anywhere.

Review URL: http://codereview.chromium.org/6621006

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

11 files changed, 24 insertions, 49 deletions

diff --git a/chrome/common/extensions/extension_localization_peer.cc b/chrome/common/extensions/extension_localization_peer.cc
index 73e21b2..f76ba38 100644
--- a/chrome/common/extensions/extension_localization_peer.cc
+++ b/chrome/common/extensions/extension_localization_peer.cc
@@ -55,8 +55,7 @@ bool ExtensionLocalizationPeer::OnReceivedRedirect(
 }
 
 void ExtensionLocalizationPeer::OnReceivedResponse(
-    const webkit_glue::ResourceResponseInfo& info,
-    bool content_filtered) {
+    const webkit_glue::ResourceResponseInfo& info) {
   response_info_ = info;
 }
 
@@ -74,7 +73,7 @@ void ExtensionLocalizationPeer::OnCompletedRequest(
   // Give sub-classes a chance at altering the data.
   if (status.status() != net::URLRequestStatus::SUCCESS) {
     // We failed to load the resource.
-    original_peer_->OnReceivedResponse(response_info_, true);
+    original_peer_->OnReceivedResponse(response_info_);
     net::URLRequestStatus status(net::URLRequestStatus::CANCELED,
                                  net::ERR_ABORTED);
     original_peer_->OnCompletedRequest(status, security_info, completion_time);
@@ -83,7 +82,7 @@ void ExtensionLocalizationPeer::OnCompletedRequest(
 
   ReplaceMessages();
 
-  original_peer_->OnReceivedResponse(response_info_, true);
+  original_peer_->OnReceivedResponse(response_info_);
   if (!data_.empty())
     original_peer_->OnReceivedData(data_.data(),
                                    static_cast<int>(data_.size()));
diff --git a/chrome/common/extensions/extension_localization_peer.h b/chrome/common/extensions/extension_localization_peer.h
index 49881f2..c633933 100644
--- a/chrome/common/extensions/extension_localization_peer.h
+++ b/chrome/common/extensions/extension_localization_peer.h
@@ -37,8 +37,7 @@ class ExtensionLocalizationPeer
       bool* has_new_first_party_for_cookies,
       GURL* new_first_party_for_cookies);
   virtual void OnReceivedResponse(
-      const webkit_glue::ResourceResponseInfo& info,
-      bool content_filtered);
+      const webkit_glue::ResourceResponseInfo& info);
   virtual void OnDownloadedData(int len) {}
   virtual void OnReceivedData(const char* data, int len);
   virtual void OnCompletedRequest(const net::URLRequestStatus& status,
diff --git a/chrome/common/extensions/extension_localization_peer_unittest.cc b/chrome/common/extensions/extension_localization_peer_unittest.cc
index 87cea6b..a0205d5 100644
--- a/chrome/common/extensions/extension_localization_peer_unittest.cc
+++ b/chrome/common/extensions/extension_localization_peer_unittest.cc
@@ -63,9 +63,8 @@ class MockResourceLoaderBridgePeer
       const webkit_glue::ResourceResponseInfo& info,
       bool* has_new_first_party_for_cookies,
       GURL* new_first_party_for_cookies));
-  MOCK_METHOD2(OnReceivedResponse, void(
-      const webkit_glue::ResourceResponseInfo& info,
-      bool content_filtered));
+  MOCK_METHOD1(OnReceivedResponse, void(
+      const webkit_glue::ResourceResponseInfo& info));
   MOCK_METHOD1(OnDownloadedData, void(int len));
   MOCK_METHOD2(OnReceivedData, void(const char* data, int len));
   MOCK_METHOD3(OnCompletedRequest, void(
@@ -139,7 +138,7 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestBadURLRequestStatus) {
   // It will self-delete once it exits OnCompletedRequest.
   ExtensionLocalizationPeer* filter_peer = filter_peer_.release();
 
-  EXPECT_CALL(*original_peer_, OnReceivedResponse(_, true));
+  EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
   EXPECT_CALL(*original_peer_, OnCompletedRequest(
     IsURLRequestEqual(net::URLRequestStatus::CANCELED), "", base::Time()));
 
@@ -155,7 +154,7 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestEmptyData) {
   EXPECT_CALL(*original_peer_, OnReceivedData(_, _)).Times(0);
   EXPECT_CALL(*sender_, Send(_)).Times(0);
 
-  EXPECT_CALL(*original_peer_, OnReceivedResponse(_, true));
+  EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
   EXPECT_CALL(*original_peer_, OnCompletedRequest(
       IsURLRequestEqual(net::URLRequestStatus::SUCCESS), "", base::Time()));
 
@@ -176,7 +175,7 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestNoCatalogs) {
   EXPECT_CALL(*original_peer_,
               OnReceivedData(StrEq(data.data()), data.length())).Times(2);
 
-  EXPECT_CALL(*original_peer_, OnReceivedResponse(_, true)).Times(2);
+  EXPECT_CALL(*original_peer_, OnReceivedResponse(_)).Times(2);
   EXPECT_CALL(*original_peer_, OnCompletedRequest(
       IsURLRequestEqual(
           net::URLRequestStatus::SUCCESS), "", base::Time())).Times(2);
@@ -214,7 +213,7 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestWithCatalogs) {
   EXPECT_CALL(*original_peer_,
               OnReceivedData(StrEq(data.data()), data.length()));
 
-  EXPECT_CALL(*original_peer_, OnReceivedResponse(_, true));
+  EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
   EXPECT_CALL(*original_peer_, OnCompletedRequest(
       IsURLRequestEqual(net::URLRequestStatus::SUCCESS), "", base::Time()));
 
@@ -244,7 +243,7 @@ TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestReplaceMessagesFails) {
   EXPECT_CALL(*original_peer_,
               OnReceivedData(StrEq(message.data()), message.length()));
 
-  EXPECT_CALL(*original_peer_, OnReceivedResponse(_, true));
+  EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
   EXPECT_CALL(*original_peer_, OnCompletedRequest(
       IsURLRequestEqual(net::URLRequestStatus::SUCCESS), "", base::Time()));
 
diff --git a/chrome/common/render_messages_params.cc b/chrome/common/render_messages_params.cc
index 349d7d4..fa0a38e 100644
--- a/chrome/common/render_messages_params.cc
+++ b/chrome/common/render_messages_params.cc
@@ -29,7 +29,6 @@ ViewHostMsg_FrameNavigate_Params::ViewHostMsg_FrameNavigate_Params()
       should_update_history(false),
       gesture(NavigationGestureUser),
       is_post(false),
-      is_content_filtered(false),
       was_within_same_page(false),
       http_status_code(0),
       was_fetched_via_proxy(false) {
@@ -770,7 +769,6 @@ void ParamTraits<ViewHostMsg_FrameNavigate_Params>::Write(Message* m,
   WriteParam(m, p.gesture);
   WriteParam(m, p.contents_mime_type);
   WriteParam(m, p.is_post);
-  WriteParam(m, p.is_content_filtered);
   WriteParam(m, p.was_within_same_page);
   WriteParam(m, p.http_status_code);
   WriteParam(m, p.socket_address);
@@ -796,7 +794,6 @@ bool ParamTraits<ViewHostMsg_FrameNavigate_Params>::Read(const Message* m,
       ReadParam(m, iter, &p->gesture) &&
       ReadParam(m, iter, &p->contents_mime_type) &&
       ReadParam(m, iter, &p->is_post) &&
-      ReadParam(m, iter, &p->is_content_filtered) &&
       ReadParam(m, iter, &p->was_within_same_page) &&
       ReadParam(m, iter, &p->http_status_code) &&
       ReadParam(m, iter, &p->socket_address) &&
@@ -835,8 +832,6 @@ void ParamTraits<ViewHostMsg_FrameNavigate_Params>::Log(const param_type& p,
   l->append(", ");
   LogParam(p.is_post, l);
   l->append(", ");
-  LogParam(p.is_content_filtered, l);
-  l->append(", ");
   LogParam(p.was_within_same_page, l);
   l->append(", ");
   LogParam(p.http_status_code, l);
diff --git a/chrome/common/render_messages_params.h b/chrome/common/render_messages_params.h
index 984392e..00998af 100644
--- a/chrome/common/render_messages_params.h
+++ b/chrome/common/render_messages_params.h
@@ -293,10 +293,6 @@ struct ViewHostMsg_FrameNavigate_Params {
   // True if this was a post request.
   bool is_post;
 
-  // Whether the content of the frame was replaced with some alternate content
-  // (this can happen if the resource was insecure).
-  bool is_content_filtered;
-
   // Whether the frame navigation resulted in no change to the documents within
   // the page. For example, the navigation may have just resulted in scrolling
   // to a named anchor.
diff --git a/chrome/common/resource_dispatcher.cc b/chrome/common/resource_dispatcher.cc
index 5929370..b179b45 100644
--- a/chrome/common/resource_dispatcher.cc
+++ b/chrome/common/resource_dispatcher.cc
@@ -336,7 +336,7 @@ void ResourceDispatcher::OnReceivedResponse(
       request_info->peer = new_peer;
   }
 
-  request_info->peer->OnReceivedResponse(response_head, false);
+  request_info->peer->OnReceivedResponse(response_head);
 }
 
 void ResourceDispatcher::OnReceivedCachedMetadata(
diff --git a/chrome/common/resource_dispatcher_unittest.cc b/chrome/common/resource_dispatcher_unittest.cc
index 09f1fb3..c960edf 100644
--- a/chrome/common/resource_dispatcher_unittest.cc
+++ b/chrome/common/resource_dispatcher_unittest.cc
@@ -51,9 +51,7 @@ class TestRequestCallback : public ResourceLoaderBridge::Peer {
     return true;
   }
 
-  virtual void OnReceivedResponse(
-      const ResourceResponseInfo& info,
-      bool content_filtered) {
+  virtual void OnReceivedResponse(const ResourceResponseInfo& info) {
   }
 
   virtual void OnDownloadedData(int len) {
@@ -267,9 +265,7 @@ class DeferredResourceLoadingTest : public ResourceDispatcherTest,
     return true;
   }
 
-  virtual void OnReceivedResponse(
-      const ResourceResponseInfo& info,
-      bool content_filtered) {
+  virtual void OnReceivedResponse(const ResourceResponseInfo& info) {
     EXPECT_EQ(defer_loading_, false);
     set_defer_loading(true);
   }
diff --git a/chrome/common/security_filter_peer.cc b/chrome/common/security_filter_peer.cc
index 93277a8..24c8cd9 100644
--- a/chrome/common/security_filter_peer.cc
+++ b/chrome/common/security_filter_peer.cc
@@ -75,8 +75,7 @@ bool SecurityFilterPeer::OnReceivedRedirect(
 }
 
 void SecurityFilterPeer::OnReceivedResponse(
-    const webkit_glue::ResourceResponseInfo& info,
-    bool content_filtered) {
+    const webkit_glue::ResourceResponseInfo& info) {
   NOTREACHED();
 }
 
@@ -134,8 +133,7 @@ BufferedPeer::~BufferedPeer() {
 }
 
 void BufferedPeer::OnReceivedResponse(
-    const webkit_glue::ResourceResponseInfo& info,
-    bool response_filtered) {
+    const webkit_glue::ResourceResponseInfo& info) {
   ProcessResponseInfo(info, &response_info_, mime_type_);
 }
 
@@ -152,14 +150,14 @@ void BufferedPeer::OnCompletedRequest(const net::URLRequestStatus& status,
   // Give sub-classes a chance at altering the data.
   if (status.status() != net::URLRequestStatus::SUCCESS || !DataReady()) {
     // Pretend we failed to load the resource.
-    original_peer_->OnReceivedResponse(response_info_, true);
+    original_peer_->OnReceivedResponse(response_info_);
     net::URLRequestStatus status(net::URLRequestStatus::CANCELED,
                                  net::ERR_ABORTED);
     original_peer_->OnCompletedRequest(status, security_info, completion_time);
     return;
   }
 
-  original_peer_->OnReceivedResponse(response_info_, true);
+  original_peer_->OnReceivedResponse(response_info_);
   if (!data_.empty())
     original_peer_->OnReceivedData(data_.data(),
                                    static_cast<int>(data_.size()));
@@ -183,8 +181,7 @@ ReplaceContentPeer::~ReplaceContentPeer() {
 }
 
 void ReplaceContentPeer::OnReceivedResponse(
-    const webkit_glue::ResourceResponseInfo& info,
-    bool content_filtered) {
+    const webkit_glue::ResourceResponseInfo& info) {
   // Ignore this, we'll serve some alternate content in OnCompletedRequest.
 }
 
@@ -200,7 +197,7 @@ void ReplaceContentPeer::OnCompletedRequest(
   ProcessResponseInfo(info, &info, mime_type_);
   info.security_info = security_info;
   info.content_length = static_cast<int>(data_.size());
-  original_peer_->OnReceivedResponse(info, true);
+  original_peer_->OnReceivedResponse(info);
   if (!data_.empty())
     original_peer_->OnReceivedData(data_.data(),
                                    static_cast<int>(data_.size()));
diff --git a/chrome/common/security_filter_peer.h b/chrome/common/security_filter_peer.h
index 53d0559..0386e66 100644
--- a/chrome/common/security_filter_peer.h
+++ b/chrome/common/security_filter_peer.h
@@ -36,8 +36,7 @@ class SecurityFilterPeer : public webkit_glue::ResourceLoaderBridge::Peer {
       bool* has_new_first_party_for_cookies,
       GURL* new_first_party_for_cookies);
   virtual void OnReceivedResponse(
-      const webkit_glue::ResourceResponseInfo& info,
-      bool content_filtered);
+      const webkit_glue::ResourceResponseInfo& info);
   virtual void OnDownloadedData(int len) {}
   virtual void OnReceivedData(const char* data, int len);
   virtual void OnCompletedRequest(const net::URLRequestStatus& status,
@@ -66,8 +65,7 @@ class BufferedPeer : public SecurityFilterPeer {
 
   // ResourceLoaderBridge::Peer Implementation.
   virtual void OnReceivedResponse(
-      const webkit_glue::ResourceResponseInfo& info,
-      bool content_filtered);
+      const webkit_glue::ResourceResponseInfo& info);
   virtual void OnReceivedData(const char* data, int len);
   virtual void OnCompletedRequest(const net::URLRequestStatus& status,
                                   const std::string& security_info,
@@ -107,8 +105,7 @@ class ReplaceContentPeer : public SecurityFilterPeer {
 
   // ResourceLoaderBridge::Peer Implementation.
   virtual void OnReceivedResponse(
-      const webkit_glue::ResourceResponseInfo& info,
-      bool content_filtered);
+      const webkit_glue::ResourceResponseInfo& info);
   virtual void OnReceivedData(const char* data, int len);
   virtual void OnCompletedRequest(const net::URLRequestStatus& status,
                                   const std::string& security_info,
diff --git a/chrome/plugin/chrome_plugin_host.cc b/chrome/plugin/chrome_plugin_host.cc
index 7a475c2..7dc24e9 100644
--- a/chrome/plugin/chrome_plugin_host.cc
+++ b/chrome/plugin/chrome_plugin_host.cc
@@ -87,9 +87,7 @@ class PluginRequestHandlerProxy
     return true;
   }
 
-  virtual void OnReceivedResponse(
-      const ResourceResponseInfo& info,
-      bool content_filtered) {
+  virtual void OnReceivedResponse(const ResourceResponseInfo& info) {
     response_headers_ = info.headers;
     plugin_->functions().response_funcs->start_completed(
         cprequest_.get(), CPERR_SUCCESS);
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 576063f..49182bb 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -1651,7 +1651,6 @@ void RenderView::UpdateURL(WebFrame* frame) {
   params.is_post = false;
   params.page_id = page_id_;
   params.frame_id = frame->identifier();
-  params.is_content_filtered = response.isContentFiltered();
   params.socket_address.set_host(response.remoteIPAddress().utf8());
   params.socket_address.set_port(response.remotePort());
   params.was_fetched_via_proxy = response.wasFetchedViaProxy();