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

3 files changed, 11 insertions, 21 deletions

diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/glue/resource_loader_bridge.h
index e12f142..3519269 100644
--- a/webkit/glue/resource_loader_bridge.h
+++ b/webkit/glue/resource_loader_bridge.h
@@ -290,11 +290,8 @@ class ResourceLoaderBridge {
                                     GURL* new_first_party_for_cookies) = 0;
 
     // Called when response headers are available (after all redirects have
-    // been followed).  |content_filtered| is set to true if the contents is
-    // altered or replaced (usually for security reasons when the resource is
-    // deemed unsafe).
-    virtual void OnReceivedResponse(const ResourceResponseInfo& info,
-                                    bool content_filtered) = 0;
+    // been followed).
+    virtual void OnReceivedResponse(const ResourceResponseInfo& info) = 0;
 
     // Called when a chunk of response data is downloaded.  This method may be
     // called multiple times or not at all if an error occurs.  This method is
diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc
index e461ca9..b86e232 100644
--- a/webkit/glue/weburlloader_impl.cc
+++ b/webkit/glue/weburlloader_impl.cc
@@ -292,8 +292,7 @@ class WebURLLoaderImpl::Context : public base::RefCounted<Context>,
       const ResourceResponseInfo& info,
       bool* has_new_first_party_for_cookies,
       GURL* new_first_party_for_cookies);
-  virtual void OnReceivedResponse(
-      const ResourceResponseInfo& info, bool content_filtered);
+  virtual void OnReceivedResponse(const ResourceResponseInfo& info);
   virtual void OnDownloadedData(int len);
   virtual void OnReceivedData(const char* data, int len);
   virtual void OnReceivedCachedMetadata(const char* data, int len);
@@ -534,15 +533,13 @@ bool WebURLLoaderImpl::Context::OnReceivedRedirect(
 }
 
 void WebURLLoaderImpl::Context::OnReceivedResponse(
-    const ResourceResponseInfo& info,
-    bool content_filtered) {
+    const ResourceResponseInfo& info) {
   if (!client_)
     return;
 
   WebURLResponse response;
   response.initialize();
   PopulateURLResponse(request_.url(), info, &response);
-  response.setIsContentFiltered(content_filtered);
 
   bool show_raw_listing = (GURL(request_.url()).query() == "raw");
 
@@ -694,7 +691,7 @@ void WebURLLoaderImpl::Context::HandleDataURL() {
   std::string data;
 
   if (GetInfoFromDataURL(request_.url(), &info, &data, &status)) {
-    OnReceivedResponse(info, false);
+    OnReceivedResponse(info);
     if (!data.empty())
       OnReceivedData(data.data(), data.size());
   }
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
index fe7f7be..b266117 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
@@ -250,10 +250,9 @@ class RequestProxy : public net::URLRequest::Delegate,
     }
   }
 
-  void NotifyReceivedResponse(const ResourceResponseInfo& info,
-                              bool content_filtered) {
+  void NotifyReceivedResponse(const ResourceResponseInfo& info) {
     if (peer_)
-      peer_->OnReceivedResponse(info, content_filtered);
+      peer_->OnReceivedResponse(info);
   }
 
   void NotifyReceivedData(int bytes_read) {
@@ -402,10 +401,9 @@ class RequestProxy : public net::URLRequest::Delegate,
   }
 
   virtual void OnReceivedResponse(
-      const ResourceResponseInfo& info,
-      bool content_filtered) {
+      const ResourceResponseInfo& info) {
     owner_loop_->PostTask(FROM_HERE, NewRunnableMethod(
-        this, &RequestProxy::NotifyReceivedResponse, info, content_filtered));
+        this, &RequestProxy::NotifyReceivedResponse, info));
   }
 
   virtual void OnReceivedData(int bytes_read) {
@@ -449,7 +447,7 @@ class RequestProxy : public net::URLRequest::Delegate,
     if (request->status().is_success()) {
       ResourceResponseInfo info;
       PopulateResponseInfo(request, &info);
-      OnReceivedResponse(info, false);
+      OnReceivedResponse(info);
       AsyncReadData();  // start reading
     } else {
       Done();
@@ -594,9 +592,7 @@ class SyncRequestProxy : public RequestProxy {
     result_->url = new_url;
   }
 
-  virtual void OnReceivedResponse(
-      const ResourceResponseInfo& info,
-      bool content_filtered) {
+  virtual void OnReceivedResponse(const ResourceResponseInfo& info) {
     *static_cast<ResourceResponseInfo*>(result_) = info;
   }