Correctly integrate StoragePartition into TestingProfile.

chrome/browser/captive_portal/captive_portal_detector_unittest.cc

 // Copyright (c) 2012 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/captive_portal/captive_portal_detector.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
-#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
 #include "base/time/time.h"
 #include "chrome/browser/captive_portal/testing_utils.h"
 #include "chrome/test/base/testing_profile.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_fetcher.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace captive_portal {
 
 namespace {
 
 class CaptivePortalClient {
@@ skipping 42 matching lines @@
     ASSERT_FALSE(FetchingURL());
 
     GURL url(CaptivePortalDetector::kDefaultURL);
     CaptivePortalClient client(detector());
 
     detector()->DetectCaptivePortal(url,
         base::Bind(&CaptivePortalClient::OnPortalDetectionCompleted,
                    base::Unretained(&client)));
 
     ASSERT_TRUE(FetchingURL());
-    base::MessageLoop::current()->RunUntilIdle();
+    base::RunLoop().RunUntilIdle();
 
     CompleteURLFetch(net_error, status_code, response_headers);
 
     EXPECT_FALSE(FetchingURL());
     EXPECT_EQ(1, client.num_results_received());
     EXPECT_EQ(expected_results.result, client.captive_portal_results().result);
     EXPECT_EQ(expected_results.response_code,
               client.captive_portal_results().response_code);
     EXPECT_EQ(expected_results.retry_after_delta,
               client.captive_portal_results().retry_after_delta);
   }
 
   void RunCancelTest() {
     ASSERT_FALSE(FetchingURL());
 
     GURL url(CaptivePortalDetector::kDefaultURL);
     CaptivePortalClient client(detector());
 
     detector()->DetectCaptivePortal(url,
         base::Bind(&CaptivePortalClient::OnPortalDetectionCompleted,
                    base::Unretained(&client)));
 
     ASSERT_TRUE(FetchingURL());
-    base::MessageLoop::current()->RunUntilIdle();
+    base::RunLoop().RunUntilIdle();
 
     detector()->Cancel();
 
     ASSERT_FALSE(FetchingURL());
     EXPECT_EQ(0, client.num_results_received());
   }
 
  private:
-  base::MessageLoop message_loop_;
+  content::TestBrowserThreadBundle thread_bundle_;
 
   // Definition order does matter.
   TestingProfile profile_;
   CaptivePortalDetector detector_;
 };
 
 // Test that the CaptivePortalDetector returns the expected result
 // codes in response to a variety of probe results.
 TEST_F(CaptivePortalDetectorTest, CaptivePortalResultCodes) {
   CaptivePortalDetector::Results results;
@@ skipping 79 matching lines @@
 
 TEST_F(CaptivePortalDetectorTest, Cancel) {
   RunCancelTest();
   CaptivePortalDetector::Results results;
   results.result = RESULT_INTERNET_CONNECTED;
   results.response_code = 204;
   RunTest(results, net::OK, 204, NULL);
 }
 
 }  // namespace captive_portal