Use OAuth2 token for sync

chrome/browser/ui/webui/sync_setup_handler_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/ui/webui/sync_setup_handler.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/signin/fake_auth_status_provider.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"
 #include "chrome/common/chrome_switches.h"
 #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"
 #include "ui/base/layout.h"
 
 using ::testing::_;
 using ::testing::Mock;
 using ::testing::Return;
 using ::testing::ReturnRef;
 using ::testing::Values;
@@ skipping 291 matching lines @@
 static ProfileKeyedService* BuildSigninManagerBaseMock(
     content::BrowserContext* profile) {
   return new SigninManagerBaseMock(static_cast<Profile*>(profile));
 }
 
 // The boolean parameter indicates whether the test is run with ClientOAuth
 // or not.  The test parameter is a bool: whether or not to test with/
 // /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) {
       if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUseClientLoginSigninFlow)) {
             CommandLine::ForCurrentProcess()->AppendSwitch(
                 switches::kUseClientLoginSigninFlow);
       }
     } else {
       DCHECK(!CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 55 matching lines @@
 
   void ExpectDone() {
     ASSERT_EQ(1U, web_ui_.call_data().size());
     const TestWebUI::CallData& data = web_ui_.call_data()[0];
     EXPECT_EQ("SyncSetupOverlay.showSyncSetupPage", data.function_name);
     std::string page;
     ASSERT_TRUE(data.arg1->GetAsString(&page));
     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_;
 };
 
 TEST_P(SyncSetupHandlerTest, Basic) {
 }
 
 TEST_P(SyncSetupHandlerTest, DisplayBasicLogin) {
   EXPECT_CALL(*mock_pss_, IsSyncEnabledAndLoggedIn())
@@ skipping 891 matching lines @@
   ExpectConfig();
   const TestWebUI::CallData& data = web_ui_.call_data()[0];
   DictionaryValue* dictionary;
   ASSERT_TRUE(data.arg2->GetAsDictionary(&dictionary));
   CheckBool(dictionary, "encryptAllData", true);
 }
 
 INSTANTIATE_TEST_CASE_P(SyncSetupHandlerTestWithParam,
                         SyncSetupHandlerTest,
                         Values(true, false));