Switch from TestBrowserThread to TestBrowserThreadBundle in chrome.

chrome/browser/extensions/api/identity/gaia_web_auth_flow_unittest.cc

 // Copyright (c) 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/extensions/api/identity/gaia_web_auth_flow.h"
 
 #include <vector>
 
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 class FakeWebAuthFlow : public WebAuthFlow {
  public:
   explicit FakeWebAuthFlow(WebAuthFlow::Delegate* delegate)
       : WebAuthFlow(delegate,
                     NULL,
@@ skipping 34 matching lines @@
                     GoogleServiceAuthError service_error,
                     const std::string& oauth_error));
   MOCK_METHOD2(OnGaiaFlowCompleted,
                void(const std::string& access_token,
                     const std::string& expiration));
 };
 
 class IdentityGaiaWebAuthFlowTest : public testing::Test {
  public:
   IdentityGaiaWebAuthFlowTest()
-      : ubertoken_error_state_(GoogleServiceAuthError::NONE),
-        fake_ui_thread_(content::BrowserThread::UI, &message_loop_) {}
+      : ubertoken_error_state_(GoogleServiceAuthError::NONE) {}
 
   virtual void TearDown() {
     testing::Test::TearDown();
     base::RunLoop loop;
     loop.RunUntilIdle();  // Run tasks so FakeWebAuthFlows get deleted.
   }
 
   std::unique_ptr<TestGaiaWebAuthFlow> CreateTestFlow() {
     ExtensionTokenKey token_key(
         "extension_id", "account_id", std::set<std::string>());
@@ skipping 10 matching lines @@
   }
 
   void set_ubertoken_error(
       GoogleServiceAuthError::State ubertoken_error_state) {
     ubertoken_error_state_ = ubertoken_error_state;
   }
 
  protected:
   testing::StrictMock<MockGaiaWebAuthFlowDelegate> delegate_;
   GoogleServiceAuthError::State ubertoken_error_state_;
-  base::MessageLoop message_loop_;
-  content::TestBrowserThread fake_ui_thread_;
+  content::TestBrowserThreadBundle test_browser_thread_bundle_;
 };
 
 TEST_F(IdentityGaiaWebAuthFlowTest, OAuthError) {
   std::unique_ptr<TestGaiaWebAuthFlow> flow = CreateTestFlow();
   flow->Start();
   EXPECT_CALL(delegate_, OnGaiaFlowFailure(
           GaiaWebAuthFlow::OAUTH_ERROR,
           GoogleServiceAuthError(GoogleServiceAuthError::NONE),
           "access_denied"));
   flow->OnAuthFlowTitleChange(GetFinalTitle("error=access_denied"));
@@ skipping 121 matching lines @@
   EXPECT_CALL(
       delegate_,
       OnGaiaFlowFailure(
           GaiaWebAuthFlow::WINDOW_CLOSED,
           GoogleServiceAuthError(GoogleServiceAuthError::NONE),
           ""));
   flow->OnAuthFlowFailure(WebAuthFlow::WINDOW_CLOSED);
 }
 
 }  // namespace extensions