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

6 files changed, 3 insertions, 16 deletions

diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc
index e99ae1e..eaf2398 100644
--- a/content/browser/renderer_host/test_render_view_host.cc
+++ b/content/browser/renderer_host/test_render_view_host.cc
@@ -97,7 +97,6 @@ void TestRenderViewHost::SendNavigateWithTransition(
   params.gesture = NavigationGestureUser;
   params.contents_mime_type = std::string();
   params.is_post = false;
-  params.is_content_filtered = false;
   params.was_within_same_page = false;
   params.http_status_code = 0;
   params.socket_address.set_host("2001:db8::1");
diff --git a/content/browser/tab_contents/navigation_controller.cc b/content/browser/tab_contents/navigation_controller.cc
index 7601d23..4ce0398 100644
--- a/content/browser/tab_contents/navigation_controller.cc
+++ b/content/browser/tab_contents/navigation_controller.cc
@@ -585,7 +585,6 @@ bool NavigationController::RendererDidNavigate(
   details->entry = active_entry;
   details->is_main_frame = PageTransition::IsMainFrame(params.transition);
   details->serialized_security_info = params.security_info;
-  details->is_content_filtered = params.is_content_filtered;
   details->http_status_code = params.http_status_code;
   NotifyNavigationEntryCommitted(details, extra_invalidate_flags);
 
diff --git a/content/browser/tab_contents/navigation_controller.h b/content/browser/tab_contents/navigation_controller.h
index f348368..8cc5267 100644
--- a/content/browser/tab_contents/navigation_controller.h
+++ b/content/browser/tab_contents/navigation_controller.h
@@ -59,7 +59,6 @@ class NavigationController {
           did_replace_entry(false),
           is_in_page(false),
           is_main_frame(true),
-          is_content_filtered(false),
           http_status_code(0) {
     }
 
@@ -98,10 +97,6 @@ class NavigationController {
     // sub-frame.
     bool is_main_frame;
 
-    // Whether the content of this frame has been altered/blocked because it was
-    // unsafe.
-    bool is_content_filtered;
-
     // When the committed load is a web page from the renderer, this string
     // specifies the security state if the page is secure.
     // See ViewHostMsg_FrameNavigate_Params.security_info, where it comes from.
diff --git a/content/browser/tab_contents/provisional_load_details.cc b/content/browser/tab_contents/provisional_load_details.cc
index d85d846..319f2b0 100644
--- a/content/browser/tab_contents/provisional_load_details.cc
+++ b/content/browser/tab_contents/provisional_load_details.cc
@@ -11,7 +11,6 @@ ProvisionalLoadDetails::ProvisionalLoadDetails(bool is_main_frame,
                                                bool is_in_page_navigation,
                                                const GURL& url,
                                                const std::string& security_info,
-                                               bool is_content_filtered,
                                                bool is_error_page,
                                                int64 frame_id)
       : error_code_(net::OK),
@@ -23,7 +22,6 @@ ProvisionalLoadDetails::ProvisionalLoadDetails(bool is_main_frame,
         ssl_cert_status_(0),
         ssl_security_bits_(-1),
         ssl_connection_status_(0),
-        is_content_filtered_(is_content_filtered),
         is_error_page_(is_error_page),
         frame_id_(frame_id) {
   SSLManager::DeserializeSecurityInfo(security_info,
diff --git a/content/browser/tab_contents/provisional_load_details.h b/content/browser/tab_contents/provisional_load_details.h
index 54fe887..092d186 100644
--- a/content/browser/tab_contents/provisional_load_details.h
+++ b/content/browser/tab_contents/provisional_load_details.h
@@ -27,7 +27,6 @@ class ProvisionalLoadDetails {
                          bool in_page_navigation,
                          const GURL& url,
                          const std::string& security_info,
-                         bool is_filtered,
                          bool is_error_page,
                          int64 frame_id);
   virtual ~ProvisionalLoadDetails() { }
@@ -56,8 +55,6 @@ class ProvisionalLoadDetails {
 
   int ssl_connection_status() const { return ssl_connection_status_; }
 
-  bool is_content_filtered() const { return is_content_filtered_; }
-
   bool is_error_page() const { return is_error_page_; }
 
   int64 frame_id() const { return frame_id_; }
@@ -72,7 +69,6 @@ class ProvisionalLoadDetails {
   int ssl_cert_status_;
   int ssl_security_bits_;
   int ssl_connection_status_;
-  bool is_content_filtered_;
   bool is_error_page_;
   int64 frame_id_;
 
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index 213697f..0ae8f4a1 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -1362,7 +1362,7 @@ void TabContents::OnDidStartProvisionalLoadForFrame(int64 frame_id,
   ProvisionalLoadDetails details(
       is_main_frame,
       controller_.IsURLInPageNavigation(validated_url),
-      validated_url, std::string(), false, is_error_page, frame_id);
+      validated_url, std::string(), is_error_page, frame_id);
   NotificationService::current()->Notify(
       NotificationType::FRAME_PROVISIONAL_LOAD_START,
       Source<NavigationController>(&controller_),
@@ -1456,7 +1456,7 @@ void TabContents::OnDidFailProvisionalLoadWithError(
   // Send out a notification that we failed a provisional load with an error.
   ProvisionalLoadDetails details(
       is_main_frame, controller_.IsURLInPageNavigation(validated_url),
-      validated_url, std::string(), false, false, frame_id);
+      validated_url, std::string(), false, frame_id);
   details.set_error_code(error_code);
 
   NotificationService::current()->Notify(
@@ -2172,7 +2172,7 @@ void TabContents::DidNavigate(RenderViewHost* rvh,
     // event.
     bool is_main_frame = did_navigate ? details.is_main_frame : false;
     ProvisionalLoadDetails load_details(
-        is_main_frame, details.is_in_page, params.url, std::string(), false,
+        is_main_frame, details.is_in_page, params.url, std::string(),
         false, params.frame_id);
     load_details.set_transition_type(params.transition);
     // Whether or not a page transition was triggered by going backward or