Index: chrome/browser/ui/webui/sync_setup_handler_unittest.cc |
diff --git a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc |
index ded7816f360063a0d8d50fd687cb7159328fda79..6648cc53aa7de900fa0c896fd6692f4b27141dfb 100644 |
--- a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc |
+++ b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc |
@@ -26,6 +26,7 @@ |
#include "chrome/common/pref_names.h" |
#include "chrome/test/base/testing_profile.h" |
#include "content/public/browser/web_ui.h" |
+#include "content/public/test/test_browser_thread.h" |
#include "grit/generated_resources.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "ui/base/l10n/l10n_util.h" |
@@ -337,7 +338,9 @@ static ProfileKeyedService* BuildSigninManagerBaseMock( |
// /ClientLogin enabled or not. |
class SyncSetupHandlerTest : public testing::TestWithParam<bool> { |
public: |
- SyncSetupHandlerTest() : error_(GoogleServiceAuthError::NONE) {} |
+ SyncSetupHandlerTest() : |
+ error_(GoogleServiceAuthError::NONE), |
tim (not reviewing)
2013/05/23 19:03:42
indent is off (4 spaces)
pavely
2013/05/30 07:42:12
Done.
|
+ ui_thread_(content::BrowserThread::UI, &message_loop_) {} |
virtual void SetUp() OVERRIDE { |
bool use_client_login_flow = GetParam(); |
if (use_client_login_flow) { |
@@ -413,11 +416,12 @@ class SyncSetupHandlerTest : public testing::TestWithParam<bool> { |
EXPECT_EQ(page, "done"); |
} |
+ GoogleServiceAuthError error_; |
+ MessageLoop message_loop_; |
+ content::TestBrowserThread ui_thread_; |
scoped_ptr<Profile> profile_; |
ProfileSyncServiceMock* mock_pss_; |
- GoogleServiceAuthError error_; |
// MessageLoop instance is required to work with OneShotTimer. |
Andrew T Wilson (Slow)
2013/05/24 14:10:15
Is this comment now obsolete?
|
- MessageLoop message_loop_; |
SigninManagerBase* mock_signin_; |
TestWebUI web_ui_; |
scoped_ptr<TestingSyncSetupHandler> handler_; |