diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-07 23:46:56 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-07 23:46:56 +0000 |
| commit | 28d0c9c14970a0e1c3c6dcc0746529446c692393 (patch) | |
| tree | 528fac009ac1b174d48b880af2c3acc363fc34e8 /chrome/browser/views | |
| parent | 19b4dbf7f2fd0e5db31accb599c97c042a043b07 (diff) | |
| download | chromium_src-28d0c9c14970a0e1c3c6dcc0746529446c692393.zip chromium_src-28d0c9c14970a0e1c3c6dcc0746529446c692393.tar.gz chromium_src-28d0c9c14970a0e1c3c6dcc0746529446c692393.tar.bz2 | |
Update sync unit tests to build on linux
Review URL: http://codereview.chromium.org/218014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/sync/sync_setup_wizard_unittest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/views/sync/sync_setup_wizard_unittest.cc b/chrome/browser/views/sync/sync_setup_wizard_unittest.cc index a6ff71e..4861649 100644 --- a/chrome/browser/views/sync/sync_setup_wizard_unittest.cc +++ b/chrome/browser/views/sync/sync_setup_wizard_unittest.cc @@ -46,7 +46,7 @@ class ProfileSyncServiceForWizardTest : public ProfileSyncService { } virtual string16 GetAuthenticatedUsername() const { - return UTF8ToWide(username_); + return UTF8ToUTF16(username_); } void set_auth_state(const std::string& last_email, AuthErrorState state) { @@ -210,7 +210,7 @@ TEST_F(SyncSetupWizardTest, InitialStepLogin) { EXPECT_EQ(SyncSetupWizard::GAIA_LOGIN, test_window_->flow()->current_state_); dialog_args.Clear(); SyncSetupFlow::GetArgsForGaiaLogin(service_, &dialog_args); - EXPECT_EQ(2, dialog_args.GetSize()); + EXPECT_TRUE(2 == dialog_args.GetSize()); std::string actual_user; dialog_args.GetString(L"user", &actual_user); EXPECT_EQ(kTestUser, actual_user); @@ -342,7 +342,7 @@ TEST_F(SyncSetupWizardTest, DiscreteRun) { wizard_->Step(SyncSetupWizard::GAIA_LOGIN); EXPECT_TRUE(wizard_->IsVisible()); SyncSetupFlow::GetArgsForGaiaLogin(service_, &dialog_args); - EXPECT_EQ(2, dialog_args.GetSize()); + EXPECT_TRUE(2 == dialog_args.GetSize()); std::string actual_user; dialog_args.GetString(L"user", &actual_user); EXPECT_EQ(kTestUser, actual_user); @@ -356,4 +356,3 @@ TEST_F(SyncSetupWizardTest, DiscreteRun) { } #endif // CHROME_PERSONALIZATION - |