Correctly integrate StoragePartition into TestingProfile.

chrome/browser/search/iframe_source_unittest.cc

 // Copyright 2013 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/search/iframe_source.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/search/instant_io_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/test/mock_resource_context.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "grit/browser_resources.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 const int kNonInstantRendererPID = 0;
 const char kNonInstantOrigin[] = "http://evil";
 const int kInstantRendererPID = 1;
 const char kInstantOrigin[] = "chrome-search://instant";
 const int kInvalidRendererPID = 42;
 
 class TestIframeSource : public IframeSource {
@@ skipping 37 matching lines @@
   }
 };
 
 class IframeSourceTest : public testing::Test {
  public:
   // net::URLRequest wants to be executed with a message loop that has TYPE_IO.
   // InstantIOContext needs to be created on the UI thread and have everything
   // else happen on the IO thread. This setup is a hacky way to satisfy all
   // those constraints.
   IframeSourceTest()
-    : message_loop_(base::MessageLoop::TYPE_IO),
-      ui_thread_(content::BrowserThread::UI, &message_loop_),
-      io_thread_(content::BrowserThread::IO, &message_loop_),
-      instant_io_context_(NULL),
-      response_(NULL) {
+      : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
+        resource_context_(&test_url_request_context_),
+        instant_io_context_(NULL),
+        response_(NULL) {
   }
 
   TestIframeSource* source() { return source_.get(); }
 
   std::string response_string() {
     if (response_.get()) {
       return std::string(reinterpret_cast<const char*>(response_->front()),
                          response_->size());
     }
     return "";
@@ skipping 23 matching lines @@
 
   void SendJSWithOrigin(
       int resource_id,
       int render_process_id,
       int render_view_id) {
     source()->SendJSWithOrigin(resource_id, render_process_id, render_view_id,
                                callback_);
   }
 
  private:
-  virtual void SetUp() {
+  virtual void SetUp() OVERRIDE {
     source_.reset(new TestIframeSource());
     callback_ = base::Bind(&IframeSourceTest::SaveResponse,
                            base::Unretained(this));
     instant_io_context_ = new InstantIOContext;
     InstantIOContext::SetUserDataOnIO(&resource_context_, instant_io_context_);
     InstantIOContext::AddInstantProcessOnIO(instant_io_context_,
                                             kInstantRendererPID);
     response_ = NULL;
   }
 
   virtual void TearDown() {
     source_.reset();
   }
 
   void SaveResponse(base::RefCountedMemory* data) {
     response_ = data;
   }
 
-  base::MessageLoop message_loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread io_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
 
+  net::TestURLRequestContext test_url_request_context_;
   content::MockResourceContext resource_context_;
   scoped_ptr<TestIframeSource> source_;
   content::URLDataSource::GotDataCallback callback_;
   scoped_refptr<InstantIOContext> instant_io_context_;
   scoped_refptr<base::RefCountedMemory> response_;
 };
 
 TEST_F(IframeSourceTest, ShouldServiceRequest) {
   scoped_ptr<net::URLRequest> request;
   request.reset(MockRequest("http://test/loader.js", true,
@@ skipping 31 matching lines @@
 }
 
 TEST_F(IframeSourceTest, SendJSWithOrigin) {
   SendJSWithOrigin(IDR_MOST_VISITED_TITLE_JS, kInstantRendererPID, 0);
   EXPECT_FALSE(response_string().empty());
   SendJSWithOrigin(IDR_MOST_VISITED_TITLE_JS, kNonInstantRendererPID, 0);
   EXPECT_FALSE(response_string().empty());
   SendJSWithOrigin(IDR_MOST_VISITED_TITLE_JS, kInvalidRendererPID, 0);
   EXPECT_TRUE(response_string().empty());
 }