This CL adds unit-tests for the SafeBrowsingBlockingPage class.

This required:
- creating a factory to create SafeBrowsingBlockingPage
  instances (so unit-tests can provide their own sub-classes).
- making the code posts tasks on the current message loop
  when there is no IO thread.  This should only happen in
  tests scenarios where we only have 1 thread.

BUG=6731
TEST=Run the unit-tests. In Chrome, navigate to pages flagged as malware (ex: ianfette.org) and make sure the safe browsing feature still works as expected.

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

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

9 files changed, 448 insertions, 23 deletions

diff --git a/chrome/browser/renderer_host/mock_render_process_host.cc b/chrome/browser/renderer_host/mock_render_process_host.cc
index b25f3ad..2e6e61e 100644
--- a/chrome/browser/renderer_host/mock_render_process_host.cc
+++ b/chrome/browser/renderer_host/mock_render_process_host.cc
@@ -7,6 +7,8 @@
 MockRenderProcessHost::MockRenderProcessHost(Profile* profile)
     : RenderProcessHost(profile),
       transport_dib_(NULL) {
+  static int prev_pid = 0;
+  SetProcessID(++prev_pid);
 }
 
 MockRenderProcessHost::~MockRenderProcessHost() {
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index dd090c0..e87b44b 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -49,6 +49,30 @@ static const char* const kLearnMoreCommand = "learnMore";
 static const char* const kProceedCommand = "proceed";
 static const char* const kTakeMeBackCommand = "takeMeBack";
 
+// static
+SafeBrowsingBlockingPageFactory* SafeBrowsingBlockingPage::factory_ = NULL;
+
+// The default SafeBrowsingBlockingPageFactory.  Global, made a singleton so we
+// don't leak it.
+class SafeBrowsingBlockingPageFactoryImpl
+    : public SafeBrowsingBlockingPageFactory {
+ public:
+  SafeBrowsingBlockingPage* CreateSafeBrowsingPage(
+      SafeBrowsingService* service,
+      WebContents* web_contents,
+      const SafeBrowsingBlockingPage::UnsafeResourceList& unsafe_resources) {
+    return new SafeBrowsingBlockingPage(service, web_contents,
+                                        unsafe_resources);
+  }
+
+ private:
+  friend struct DefaultSingletonTraits<SafeBrowsingBlockingPageFactoryImpl>;
+
+  SafeBrowsingBlockingPageFactoryImpl() { }
+
+  DISALLOW_COPY_AND_ASSIGN(SafeBrowsingBlockingPageFactoryImpl);
+};
+
 SafeBrowsingBlockingPage::SafeBrowsingBlockingPage(
     SafeBrowsingService* sb_service,
     WebContents* web_contents,
@@ -349,8 +373,8 @@ void SafeBrowsingBlockingPage::Proceed() {
     // Build an interstitial for all the unsafe resources notifications.
     // Don't show it now as showing an interstitial while an interstitial is
     // already showing would cause DontProceed() to be invoked.
-    blocking_page = new SafeBrowsingBlockingPage(sb_service_, tab(),
-                                                 iter->second);
+    blocking_page = factory_->CreateSafeBrowsingPage(sb_service_, tab(),
+                                                     iter->second);
     unsafe_resource_map->erase(iter);
   }
 
@@ -391,11 +415,13 @@ void SafeBrowsingBlockingPage::NotifySafeBrowsingService(
     SafeBrowsingService* sb_service,
     const UnsafeResourceList& unsafe_resources,
     bool proceed) {
-  base::Thread* io_thread = g_browser_process->io_thread();
-  if (!io_thread)
-    return;
+  MessageLoop* message_loop;
+  if (g_browser_process->io_thread())
+    message_loop = g_browser_process->io_thread()->message_loop();
+  else  // For unit-tests, just post on the current thread.
+    message_loop = MessageLoop::current();
 
-  io_thread->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
+  message_loop->PostTask(FROM_HERE, NewRunnableMethod(
       sb_service, &SafeBrowsingService::OnBlockingPageDone, unsafe_resources,
       proceed));
 }
@@ -418,8 +444,12 @@ void SafeBrowsingBlockingPage::ShowBlockingPage(
     // show this interstitial.
     std::vector<SafeBrowsingService::UnsafeResource> resources;
     resources.push_back(unsafe_resource);
+    // Set up the factory if this has not been done already (tests do that
+    // before this method is called).
+    if (!factory_)
+      factory_ = Singleton<SafeBrowsingBlockingPageFactoryImpl>::get();
     SafeBrowsingBlockingPage* blocking_page =
-        new SafeBrowsingBlockingPage(sb_service, web_contents, resources);
+        factory_->CreateSafeBrowsingPage(sb_service, web_contents, resources);
     blocking_page->Show();
     return;
   }
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.h b/chrome/browser/safe_browsing/safe_browsing_blocking_page.h
index 242f68f..be03a0f 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.h
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.h
@@ -38,9 +38,9 @@
 class DictionaryValue;
 class MessageLoop;
 class NavigationController;
+class SafeBrowsingBlockingPageFactory;
 class WebContents;
 
-
 class SafeBrowsingBlockingPage : public InterstitialPage {
  public:
   virtual ~SafeBrowsingBlockingPage();
@@ -54,23 +54,29 @@ class SafeBrowsingBlockingPage : public InterstitialPage {
       SafeBrowsingService* service,
       const SafeBrowsingService::UnsafeResource& resource);
 
+  // Makes the passed |factory| the factory used to instanciate
+  // SafeBrowsingBlockingPage objects. Usefull for tests.
+  static void RegisterFactory(SafeBrowsingBlockingPageFactory* factory) {
+    factory_ = factory;
+  }
+
   // InterstitialPage method:
   virtual std::string GetHTMLContents();
   virtual void Proceed();
   virtual void DontProceed();
 
+  typedef std::vector<SafeBrowsingService::UnsafeResource> UnsafeResourceList;
+
  protected:
   // InterstitialPage method:
   virtual void CommandReceived(const std::string& command);
 
- private:
-  typedef std::vector<SafeBrowsingService::UnsafeResource> UnsafeResourceList;
-
   // Don't instanciate this class directly, use ShowBlockingPage instead.
   SafeBrowsingBlockingPage(SafeBrowsingService* service,
                            WebContents* web_contents,
                            const UnsafeResourceList& unsafe_resources);
 
+ private:
   // Fills the passed dictionary with the strings passed to JS Template when
   // creating the HTML.
   void PopulateMultipleThreatStringDictionary(DictionaryValue* strings);
@@ -103,6 +109,8 @@ class SafeBrowsingBlockingPage : public InterstitialPage {
   static bool IsMainPage(const UnsafeResourceList& unsafe_resources);
 
  private:
+  friend class SafeBrowsingBlockingPageFactoryImpl;
+
   // For reporting back user actions.
   SafeBrowsingService* sb_service_;
   MessageLoop* report_loop_;
@@ -117,7 +125,23 @@ class SafeBrowsingBlockingPage : public InterstitialPage {
   // The list of unsafe resources this page is warning about.
   UnsafeResourceList unsafe_resources_;
 
+  // The factory used to instanciate SafeBrowsingBlockingPage objects.
+  // Usefull for tests, so they can provide their own implementation of
+  // SafeBrowsingBlockingPage.
+  static SafeBrowsingBlockingPageFactory* factory_;
+
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingBlockingPage);
 };
 
+// Factory for creating SafeBrowsingBlockingPage.  Useful for tests.
+class SafeBrowsingBlockingPageFactory {
+ public:
+  ~SafeBrowsingBlockingPageFactory() { }
+
+  virtual SafeBrowsingBlockingPage* CreateSafeBrowsingPage(
+      SafeBrowsingService* service,
+      WebContents* web_contents,
+      const SafeBrowsingBlockingPage::UnsafeResourceList& unsafe_resources) = 0;
+};
+
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_BLOCKING_PAGE_H_
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
new file mode 100644
index 0000000..45ff6f7
--- /dev/null
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
@@ -0,0 +1,355 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/renderer_host/test_render_view_host.h"
+
+#include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/common/render_messages.h"
+
+static const char* kGoogleURL = "http://www.google.com/";
+static const char* kGoodURL = "http://www.goodguys.com/";
+static const char* kBadURL = "http://www.badguys.com/";
+static const char* kBadURL2 = "http://www.badguys2.com/";
+static const char* kBadURL3 = "http://www.badguys3.com/";
+
+static void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params,
+                               int page_id,
+                               const GURL& url) {
+  params->page_id = page_id;
+  params->url = url;
+  params->referrer = GURL::EmptyGURL();
+  params->transition = PageTransition::TYPED;
+  params->redirects = std::vector<GURL>();
+  params->should_update_history = false;
+  params->searchable_form_url = GURL::EmptyGURL();
+  params->searchable_form_element_name = std::wstring();
+  params->searchable_form_encoding = std::string();
+  params->password_form = PasswordForm();
+  params->security_info = std::string();
+  params->gesture = NavigationGestureUser;
+  params->is_post = false;
+}
+
+// A SafeBrowingBlockingPage class that does not create windows.
+class TestSafeBrowsingBlockingPage :  public SafeBrowsingBlockingPage {
+ public:
+  TestSafeBrowsingBlockingPage(SafeBrowsingService* service,
+                               WebContents* web_contents,
+                               const UnsafeResourceList& unsafe_resources)
+      : SafeBrowsingBlockingPage(service, web_contents, unsafe_resources) {
+  }
+
+  // Overriden from InterstitialPage.  Don't create a view.
+  virtual WebContentsView* CreateWebContentsView() {
+    return NULL;
+  }
+};
+
+class TestSafeBrowsingBlockingPageFactory
+    : public SafeBrowsingBlockingPageFactory {
+ public:
+  TestSafeBrowsingBlockingPageFactory() { }
+  ~TestSafeBrowsingBlockingPageFactory() { }
+
+  virtual SafeBrowsingBlockingPage* CreateSafeBrowsingPage(
+      SafeBrowsingService* service,
+      WebContents* web_contents,
+      const SafeBrowsingBlockingPage::UnsafeResourceList& unsafe_resources) {
+    return new TestSafeBrowsingBlockingPage(service, web_contents,
+                                            unsafe_resources);
+  }
+};
+
+class SafeBrowsingBlockingPageTest : public RenderViewHostTestHarness,
+                                     public SafeBrowsingService::Client {
+ public:
+  // The decision the user made.
+  enum UserResponse {
+    PENDING,
+    OK,
+    CANCEL
+  };
+
+  SafeBrowsingBlockingPageTest() {
+    ResetUserResponse();
+    service_ = new SafeBrowsingService();
+  }
+
+  virtual void SetUp() {
+    RenderViewHostTestHarness::SetUp();
+    SafeBrowsingBlockingPage::RegisterFactory(&factory_);
+    ResetUserResponse();
+  }
+
+  // SafeBrowsingService::Client implementation.
+  virtual void OnUrlCheckResult(const GURL& url,
+                                SafeBrowsingService::UrlCheckResult result) {
+  }
+  virtual void OnBlockingPageComplete(bool proceed) {
+    if (proceed)
+      user_response_ = OK;
+    else
+      user_response_ = CANCEL;
+  }
+
+  void Navigate(const char* url, int page_id) {
+    ViewHostMsg_FrameNavigate_Params params;
+    InitNavigateParams(&params, page_id, GURL(url));
+    contents()->TestDidNavigate(contents_->render_view_host(), params);
+  }
+
+  void ShowInterstitial(ResourceType::Type resource_type,
+                        const char* url) {
+    SafeBrowsingService::UnsafeResource resource;
+    InitResource(&resource, resource_type, GURL(url));
+    SafeBrowsingBlockingPage::ShowBlockingPage(service_, resource);
+  }
+
+  // Returns the SafeBrowsingBlockingPage currently showing or NULL if none is
+  // showing.
+  SafeBrowsingBlockingPage* GetSafeBrowsingBlockingPage() {
+    InterstitialPage* interstitial =
+        InterstitialPage::GetInterstitialPage(contents_);
+    if (!interstitial)
+      return NULL;
+    return  static_cast<SafeBrowsingBlockingPage*>(interstitial);
+  }
+
+  UserResponse user_response() const { return user_response_; }
+  void ResetUserResponse() { user_response_ = PENDING; }
+
+  static void ProceedThroughInterstitial(
+      SafeBrowsingBlockingPage* sb_interstitial) {
+    sb_interstitial->Proceed();
+    // Proceed() posts a task to update the SafeBrowsingService::Client.
+    MessageLoop::current()->RunAllPending();
+  }
+
+  static void DontProceedThroughInterstitial(
+      SafeBrowsingBlockingPage* sb_interstitial) {
+    sb_interstitial->DontProceed();
+    // DontProceed() posts a task to update the SafeBrowsingService::Client.
+    MessageLoop::current()->RunAllPending();
+  }
+
+ private:
+  void InitResource(SafeBrowsingService::UnsafeResource* resource,
+                    ResourceType::Type resource_type,
+                    const GURL& url) {
+    resource->client = this;
+    resource->url = url;
+    resource->resource_type = resource_type;
+    resource->threat_type = SafeBrowsingService::URL_MALWARE;
+    resource->render_process_host_id = contents_->process()->pid();
+    resource->render_view_id = contents_->render_view_host()->routing_id();
+  }
+
+  UserResponse user_response_;
+  scoped_refptr<SafeBrowsingService> service_;
+  TestSafeBrowsingBlockingPageFactory factory_;
+};
+
+// Tests showing a blocking page for a malware page and not proceeding.
+TEST_F(SafeBrowsingBlockingPageTest, MalwarePageDontProceed) {
+  // Start a load.
+  controller()->LoadURL(GURL(kBadURL), GURL(), PageTransition::TYPED);
+
+  // Simulate the load causing a safe browsing interstitial to be shown.
+  ShowInterstitial(ResourceType::MAIN_FRAME, kBadURL);
+  SafeBrowsingBlockingPage* sb_interstitial = GetSafeBrowsingBlockingPage();
+  ASSERT_TRUE(sb_interstitial);
+
+  // Simulate the user clicking "don't proceed".
+  DontProceedThroughInterstitial(sb_interstitial);
+
+  // The interstitial should be gone.
+  EXPECT_EQ(CANCEL, user_response());
+  EXPECT_FALSE(GetSafeBrowsingBlockingPage());
+
+  // We did not proceed, the pending entry should be gone.
+  EXPECT_FALSE(controller()->GetPendingEntry());
+}
+
+// Tests showing a blocking page for a malware page and then proceeding.
+TEST_F(SafeBrowsingBlockingPageTest, MalwarePageProceed) {
+  // Start a load.
+  controller()->LoadURL(GURL(kBadURL), GURL(), PageTransition::TYPED);
+
+  // Simulate the load causing a safe browsing interstitial to be shown.
+  ShowInterstitial(ResourceType::MAIN_FRAME, kBadURL);
+  SafeBrowsingBlockingPage* sb_interstitial = GetSafeBrowsingBlockingPage();
+  ASSERT_TRUE(sb_interstitial);
+
+  // Simulate the user clicking "proceed".
+  ProceedThroughInterstitial(sb_interstitial);
+
+  // The interstitial is shown until the navigation commits.
+  ASSERT_TRUE(InterstitialPage::GetInterstitialPage(contents_));
+  // Commit the navigation.
+  Navigate(kBadURL, 1);
+  // The interstitial should be gone now.
+  ASSERT_FALSE(InterstitialPage::GetInterstitialPage(contents_));
+}
+
+// Tests showing a blocking page for a page that contains malware subresources
+// and not proceeding.
+TEST_F(SafeBrowsingBlockingPageTest, PageWithMalwareResourceDontProceed) {
+  // Navigate somewhere.
+  Navigate(kGoogleURL, 1);
+
+  // Navigate somewhere else.
+  Navigate(kGoodURL, 2);
+
+  // Simulate that page loading a bad-resource triggering an interstitial.
+  ShowInterstitial(ResourceType::SUB_RESOURCE, kBadURL);
+
+  SafeBrowsingBlockingPage* sb_interstitial = GetSafeBrowsingBlockingPage();
+  ASSERT_TRUE(sb_interstitial);
+
+  // Simulate the user clicking "don't proceed".
+  DontProceedThroughInterstitial(sb_interstitial);
+  EXPECT_EQ(CANCEL, user_response());
+  EXPECT_FALSE(GetSafeBrowsingBlockingPage());
+
+  // We did not proceed, we should be back to the first page, the 2nd one should
+  // have been removed from the navigation controller.
+  ASSERT_EQ(1, controller()->GetEntryCount());
+  EXPECT_EQ(kGoogleURL, controller()->GetActiveEntry()->url().spec());
+}
+
+// Tests showing a blocking page for a page that contains malware subresources
+// and proceeding.
+TEST_F(SafeBrowsingBlockingPageTest, PageWithMalwareResourceProceed) {
+  // Navigate somewhere.
+  Navigate(kGoodURL, 1);
+
+  // Simulate that page loading a bad-resource triggering an interstitial.
+  ShowInterstitial(ResourceType::SUB_RESOURCE, kBadURL);
+
+  SafeBrowsingBlockingPage* sb_interstitial = GetSafeBrowsingBlockingPage();
+  ASSERT_TRUE(sb_interstitial);
+
+  // Simulate the user clicking "proceed".
+  ProceedThroughInterstitial(sb_interstitial);
+  EXPECT_EQ(OK, user_response());
+  EXPECT_FALSE(GetSafeBrowsingBlockingPage());
+
+  // We did proceed, we should be back to showing the page.
+  ASSERT_EQ(1, controller()->GetEntryCount());
+  EXPECT_EQ(kGoodURL, controller()->GetActiveEntry()->url().spec());
+}
+
+// Tests showing a blocking page for a page that contains multiple malware
+// subresources and not proceeding.  This just tests that the extra malware
+// subresources (which trigger queued interstitial pages) do not break anything.
+TEST_F(SafeBrowsingBlockingPageTest,
+       PageWithMultipleMalwareResourceDontProceed) {
+  // Navigate somewhere.
+  Navigate(kGoogleURL, 1);
+
+  // Navigate somewhere else.
+  Navigate(kGoodURL, 2);
+
+  // Simulate that page loading a bad-resource triggering an interstitial.
+  ShowInterstitial(ResourceType::SUB_RESOURCE, kBadURL);
+
+  // More bad resources loading causing more interstitials. The new
+  // interstitials should be queued.
+  ShowInterstitial(ResourceType::SUB_RESOURCE, kBadURL2);
+  ShowInterstitial(ResourceType::SUB_RESOURCE, kBadURL3);
+
+  SafeBrowsingBlockingPage* sb_interstitial = GetSafeBrowsingBlockingPage();
+  ASSERT_TRUE(sb_interstitial);
+
+  // Simulate the user clicking "don't proceed".
+  DontProceedThroughInterstitial(sb_interstitial);
+  EXPECT_EQ(CANCEL, user_response());
+  EXPECT_FALSE(GetSafeBrowsingBlockingPage());
+
+  // We did not proceed, we should be back to the first page, the 2nd one should
+  // have been removed from the navigation controller.
+  ASSERT_EQ(1, controller()->GetEntryCount());
+  EXPECT_EQ(kGoogleURL, controller()->GetActiveEntry()->url().spec());
+}
+
+// Tests showing a blocking page for a page that contains multiple malware
+// subresources and proceeding through the first interstitial, but not the next.
+TEST_F(SafeBrowsingBlockingPageTest,
+       PageWithMultipleMalwareResourceProceedThenDontProceed) {
+  // Navigate somewhere.
+  Navigate(kGoogleURL, 1);
+
+  // Navigate somewhere else.
+  Navigate(kGoodURL, 2);
+
+  // Simulate that page loading a bad-resource triggering an interstitial.
+  ShowInterstitial(ResourceType::SUB_RESOURCE, kBadURL);
+
+  // More bad resources loading causing more interstitials. The new
+  // interstitials should be queued.
+  ShowInterstitial(ResourceType::SUB_RESOURCE, kBadURL2);
+  ShowInterstitial(ResourceType::SUB_RESOURCE, kBadURL3);
+
+  SafeBrowsingBlockingPage* sb_interstitial = GetSafeBrowsingBlockingPage();
+  ASSERT_TRUE(sb_interstitial);
+
+  // Proceed through the 1st interstitial.
+  ProceedThroughInterstitial(sb_interstitial);
+  EXPECT_EQ(OK, user_response());
+
+  ResetUserResponse();
+
+  // We should land to a 2nd interstitial (aggregating all the malware resources
+  // loaded while the 1st interstitial was showing).
+  sb_interstitial = GetSafeBrowsingBlockingPage();
+  ASSERT_TRUE(sb_interstitial);
+
+  // Don't proceed through the 2nd interstitial.
+  DontProceedThroughInterstitial(sb_interstitial);
+  EXPECT_EQ(CANCEL, user_response());
+  EXPECT_FALSE(GetSafeBrowsingBlockingPage());
+
+  // We did not proceed, we should be back to the first page, the 2nd one should
+  // have been removed from the navigation controller.
+  ASSERT_EQ(1, controller()->GetEntryCount());
+  EXPECT_EQ(kGoogleURL, controller()->GetActiveEntry()->url().spec());
+}
+
+// Tests showing a blocking page for a page that contains multiple malware
+// subresources and proceeding through the multiple interstitials.
+TEST_F(SafeBrowsingBlockingPageTest, PageWithMultipleMalwareResourceProceed) {
+  // Navigate somewhere else.
+  Navigate(kGoodURL, 1);
+
+  // Simulate that page loading a bad-resource triggering an interstitial.
+  ShowInterstitial(ResourceType::SUB_RESOURCE, kBadURL);
+
+  // More bad resources loading causing more interstitials. The new
+  // interstitials should be queued.
+  ShowInterstitial(ResourceType::SUB_RESOURCE, kBadURL2);
+  ShowInterstitial(ResourceType::SUB_RESOURCE, kBadURL3);
+
+  SafeBrowsingBlockingPage* sb_interstitial = GetSafeBrowsingBlockingPage();
+  ASSERT_TRUE(sb_interstitial);
+
+  // Proceed through the 1st interstitial.
+  ProceedThroughInterstitial(sb_interstitial);
+  EXPECT_EQ(OK, user_response());
+
+  ResetUserResponse();
+
+  // We should land to a 2nd interstitial (aggregating all the malware resources
+  // loaded while the 1st interstitial was showing).
+  sb_interstitial = GetSafeBrowsingBlockingPage();
+  ASSERT_TRUE(sb_interstitial);
+
+  // Proceed through the 2nd interstitial.
+  ProceedThroughInterstitial(sb_interstitial);
+  EXPECT_EQ(OK, user_response());
+
+  // We did proceed, we should be back to the initial page.
+  ASSERT_EQ(1, controller()->GetEntryCount());
+  EXPECT_EQ(kGoodURL, controller()->GetActiveEntry()->url().spec());
+}
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index 47a1941..2f8f5ea 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -264,12 +264,14 @@ void SafeBrowsingService::DoDisplayBlockingPage(
   if (!wc) {
     // The tab is gone and we did not have a chance at showing the interstitial.
     // Just act as "Don't Proceed" was chosen.
-    base::Thread* io_thread = g_browser_process->io_thread();
-    if (!io_thread)
-      return;
     std::vector<UnsafeResource> resources;
     resources.push_back(resource);
-    io_thread->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
+    MessageLoop* message_loop;
+    if (g_browser_process->io_thread())
+      message_loop = g_browser_process->io_thread()->message_loop();
+    else  // For unit-tests, just post on the current thread.
+      message_loop = MessageLoop::current();
+    message_loop->PostTask(FROM_HERE, NewRunnableMethod(
         this, &SafeBrowsingService::OnBlockingPageDone, resources, false));
     return;
   }
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h
index 6eba443..c280737 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.h
+++ b/chrome/browser/safe_browsing/safe_browsing_service.h
@@ -72,8 +72,7 @@ class SafeBrowsingService
 
   // Initializes the service.  io_loop is the message loop that the
   // caller of this service (ResourceDispatcherHost) wants to be notified on
-  // for check results.  db_loop is the message loop for the thread to do
-  // the database work.
+  // for check results.
   void Initialize(MessageLoop* io_loop);
 
   // Called to initialize objects that are used on the io_thread.
diff --git a/chrome/browser/tab_contents/interstitial_page.cc b/chrome/browser/tab_contents/interstitial_page.cc
index aa37c94..d1701b3 100644
--- a/chrome/browser/tab_contents/interstitial_page.cc
+++ b/chrome/browser/tab_contents/interstitial_page.cc
@@ -174,6 +174,7 @@ void InterstitialPage::Show() {
 
   DCHECK(!render_view_host_);
   render_view_host_ = CreateRenderViewHost();
+  CreateWebContentsView();
 
   std::string data_url = "data:text/html;charset=utf-8," +
                          EscapePath(GetHTMLContents());
@@ -253,16 +254,20 @@ RenderViewHost* InterstitialPage::CreateRenderViewHost() {
   RenderViewHost* render_view_host = new RenderViewHost(
       SiteInstance::CreateSiteInstance(tab()->profile()),
       this, MSG_ROUTING_NONE, NULL);
+  return render_view_host;
+}
+
+WebContentsView* InterstitialPage::CreateWebContentsView() {
   WebContentsView* web_contents_view = tab()->view();
   RenderWidgetHostView* view =
-      web_contents_view->CreateViewForWidget(render_view_host);
-  render_view_host->set_view(view);
-  render_view_host->AllowDomAutomationBindings();
-  render_view_host->CreateRenderView();
+      web_contents_view->CreateViewForWidget(render_view_host_);
+  render_view_host_->set_view(view);
+  render_view_host_->AllowDomAutomationBindings();
+  render_view_host_->CreateRenderView();
   view->SetSize(web_contents_view->GetContainerSize());
   // Don't show the interstitial until we have navigated to it.
   view->Hide();
-  return render_view_host;
+  return web_contents_view;
 }
 
 void InterstitialPage::Proceed() {
diff --git a/chrome/browser/tab_contents/interstitial_page.h b/chrome/browser/tab_contents/interstitial_page.h
index 3f5ceca..3d66193 100644
--- a/chrome/browser/tab_contents/interstitial_page.h
+++ b/chrome/browser/tab_contents/interstitial_page.h
@@ -16,6 +16,7 @@
 class MessageLoop;
 class NavigationEntry;
 class WebContents;
+class WebContentsView;
 
 // This class is a base class for interstitial pages, pages that show some
 // informative message asking for user validation before reaching the target
@@ -111,10 +112,14 @@ class InterstitialPage : public NotificationObserver,
   const GURL& url() const { return url_; }
   RenderViewHost* render_view_host() const { return render_view_host_; }
 
-  // Creates and shows the RenderViewHost containing the interstitial content.
+  // Creates the RenderViewHost containing the interstitial content.
   // Overriden in unit tests.
   virtual RenderViewHost* CreateRenderViewHost();
 
+  // Creates the WebContentsView that shows the interstitial RVH.
+  // Overriden in unit tests.
+  virtual WebContentsView* CreateWebContentsView();
+
  private:
   // AutomationProvider needs access to Proceed and DontProceed to simulate
   // user actions.
diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc
index 8dab8c6..2f069e9 100644
--- a/chrome/browser/tab_contents/web_contents_unittest.cc
+++ b/chrome/browser/tab_contents/web_contents_unittest.cc
@@ -150,6 +150,9 @@ class TestInterstitialPage : public InterstitialPage {
         this, MSG_ROUTING_NONE, NULL);
   }
 
+  virtual WebContentsView* CreateWebContentsView() { return NULL; }
+
+
   virtual void CommandReceived(const std::string& command) {
     command_received_count_++;
   }