Correctly integrate StoragePartition into TestingProfile.

google_apis/gaia/oauth2_access_token_fetcher_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.
 //
 // A complete set of unit tests for OAuth2AccessTokenFetcher.
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
-#include "base/message_loop.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "google_apis/gaia/oauth2_access_token_consumer.h"
 #include "google_apis/gaia/oauth2_access_token_fetcher.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_fetcher_factory.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_status.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
-using content::BrowserThread;
 using net::ResponseCookies;
 using net::ScopedURLFetcherFactory;
 using net::TestURLFetcher;
 using net::URLFetcher;
 using net::URLFetcherDelegate;
 using net::URLFetcherFactory;
 using net::URLRequestStatus;
 using testing::_;
 using testing::Return;
 
@@ skipping 38 matching lines @@
                                        const base::Time& expiration_time));
   MOCK_METHOD1(OnGetTokenFailure,
                void(const GoogleServiceAuthError& error));
 };
 
 }  // namespace
 
 class OAuth2AccessTokenFetcherTest : public testing::Test {
  public:
   OAuth2AccessTokenFetcherTest()
-    : ui_thread_(BrowserThread::UI, &message_loop_),
-      request_context_getter_(new net::TestURLRequestContextGetter(
-          message_loop_.message_loop_proxy())),
+    : request_context_getter_(new net::TestURLRequestContextGetter(
+          base::MessageLoopProxy::current())),
       fetcher_(&consumer_, request_context_getter_) {
   }
 
   virtual ~OAuth2AccessTokenFetcherTest() {}
 
   virtual TestURLFetcher* SetupGetAccessToken(
       bool fetch_succeeds, int response_code, const std::string& body) {
     GURL url(GaiaUrls::GetInstance()->oauth2_token_url());
     TestURLFetcher* url_fetcher = new TestURLFetcher(0, url, &fetcher_);
     URLRequestStatus::Status status =
         fetch_succeeds ? URLRequestStatus::SUCCESS : URLRequestStatus::FAILED;
     url_fetcher->set_status(URLRequestStatus(status, 0));
 
     if (response_code != 0)
       url_fetcher->set_response_code(response_code);
 
     if (!body.empty())
       url_fetcher->SetResponseString(body);
 
     EXPECT_CALL(factory_, CreateURLFetcher(_, url, _, _))
         .WillOnce(Return(url_fetcher));
     return url_fetcher;
   }
 
  protected:
-  base::MessageLoop message_loop_;
-  content::TestBrowserThread ui_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
   MockUrlFetcherFactory factory_;
   MockOAuth2AccessTokenConsumer consumer_;
   scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_;
   OAuth2AccessTokenFetcher fetcher_;
 };
 
 // These four tests time out, see http://crbug.com/113446.
 TEST_F(OAuth2AccessTokenFetcherTest, DISABLED_GetAccessTokenRequestFailure) {
   TestURLFetcher* url_fetcher = SetupGetAccessToken(false, 0, std::string());
   EXPECT_CALL(consumer_, OnGetTokenFailure(_)).Times(1);
@@ skipping 101 matching lines @@
     url_fetcher.SetResponseString(kValidTokenResponse);
 
     std::string at;
     int expires_in;
     EXPECT_TRUE(OAuth2AccessTokenFetcher::ParseGetAccessTokenResponse(
         &url_fetcher, &at, &expires_in));
     EXPECT_EQ("at1", at);
     EXPECT_EQ(3600, expires_in);
   }
 }