This CL adds new UI tests for the SSL UI.

Some more info:

SSL UI Tests:
Added new tests for redirects and frames.
Also improved the mixed-content test to exercise the "block mixed-contents" preference and the show info-bar.

Automation:
For the new UI tests, added methods to tab_proxy and browser_proxy. The ones of most interest are GetLastNavigatinTime and WaitForNavigation that ensures we wait for a navigation to occur or have occured when taking actions that asynchronously trigger navigations.

Resource loading:
Added a flag to the response we get when loading a resource that indicates whether that resource was filtered (blocked or altered) by the security peer. We use this flag to notify back the browser when we report a load has been committed.
This is so the SSL manager knows a frame has been filtered (in which case we have no cert info but should not consider that as unsafe).

BUG=2004
Review URL: http://codereview.chromium.org/3165

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

1 files changed, 9 insertions, 6 deletions

diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
index 336e42a..ce7157b 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
@@ -143,9 +143,10 @@ class RequestProxy : public URLRequest::Delegate,
       peer_->OnReceivedRedirect(new_url);
   }
 
-  void NotifyReceivedResponse(const ResourceLoaderBridge::ResponseInfo& info) {
+  void NotifyReceivedResponse(const ResourceLoaderBridge::ResponseInfo& info,
+                              bool content_filtered) {
     if (peer_)
-      peer_->OnReceivedResponse(info);
+      peer_->OnReceivedResponse(info, content_filtered);
   }
 
   void NotifyReceivedData(int bytes_read) {
@@ -231,9 +232,10 @@ class RequestProxy : public URLRequest::Delegate,
   }
 
   virtual void OnReceivedResponse(
-      const ResourceLoaderBridge::ResponseInfo& info) {
+      const ResourceLoaderBridge::ResponseInfo& info,
+      bool content_filtered) {
     owner_loop_->PostTask(FROM_HERE, NewRunnableMethod(
-        this, &RequestProxy::NotifyReceivedResponse, info));
+        this, &RequestProxy::NotifyReceivedResponse, info, content_filtered));
   }
 
   virtual void OnReceivedData(int bytes_read) {
@@ -263,7 +265,7 @@ class RequestProxy : public URLRequest::Delegate,
       info.headers = request->response_headers();
       request->GetMimeType(&info.mime_type);
       request->GetCharset(&info.charset);
-      OnReceivedResponse(info);
+      OnReceivedResponse(info, false);
       AsyncReadData();  // start reading
     } else {
       Done();
@@ -324,7 +326,8 @@ class SyncRequestProxy : public RequestProxy {
   }
 
   virtual void OnReceivedResponse(
-      const ResourceLoaderBridge::ResponseInfo& info) {
+      const ResourceLoaderBridge::ResponseInfo& info,
+      bool content_filtered) {
     *static_cast<ResourceLoaderBridge::ResponseInfo*>(result_) = info;
   }