diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 20:23:49 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 20:23:49 +0000 |
| commit | befe84bbceb40e25af72c21aa6f8492d1eb7ae84 (patch) | |
| tree | 5f2246572d802171682d1fc1b133a79514bd9042 /chrome/installer/util/google_update_settings_unittest.cc | |
| parent | cefe5c46afeb6e48e15a396435ca13274406004d (diff) | |
| download | chromium_src-befe84bbceb40e25af72c21aa6f8492d1eb7ae84.zip chromium_src-befe84bbceb40e25af72c21aa6f8492d1eb7ae84.tar.gz chromium_src-befe84bbceb40e25af72c21aa6f8492d1eb7ae84.tar.bz2 | |
Merge the installer, installer_util and setup_util namespaces into a single installer namespace.
BUG=61609
TEST=NONE
Review URL: http://codereview.chromium.org/5729004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/google_update_settings_unittest.cc')
| -rw-r--r-- | chrome/installer/util/google_update_settings_unittest.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/installer/util/google_update_settings_unittest.cc b/chrome/installer/util/google_update_settings_unittest.cc index 519a1c8..9fe82e9 100644 --- a/chrome/installer/util/google_update_settings_unittest.cc +++ b/chrome/installer/util/google_update_settings_unittest.cc @@ -213,11 +213,11 @@ TEST_F(GoogleUpdateSettingsTest, CurrentChromeChannelVariousApValuesUser) { } TEST_F(GoogleUpdateSettingsTest, UpdateGoogleUpdateApKey) { - installer_util::InstallStatus s = installer_util::FIRST_INSTALL_SUCCESS; - installer_util::InstallStatus f = installer_util::INSTALL_FAILED; + installer::InstallStatus s = installer::FIRST_INSTALL_SUCCESS; + installer::InstallStatus f = installer::INSTALL_FAILED; // Incremental Installer that worked. - installer_util::ChannelInfo v; + installer::ChannelInfo v; v.set_value(L""); EXPECT_FALSE(GoogleUpdateSettings::UpdateGoogleUpdateApKey(true, s, &v)); EXPECT_EQ(v.value(), L""); @@ -324,7 +324,7 @@ TEST_F(GoogleUpdateSettingsTest, UpdateDiffInstallStatusTest) { ASSERT_TRUE(CreateApKey(work_item_list.get(), L"")) << "Failed to create ap key."; GoogleUpdateSettings::UpdateDiffInstallStatus(false, true, - installer_util::INSTALL_FAILED, + installer::INSTALL_FAILED, kTestProductGuid); EXPECT_STREQ(ReadApKeyValue().c_str(), L"-full"); work_item_list->Rollback(); @@ -334,7 +334,7 @@ TEST_F(GoogleUpdateSettingsTest, UpdateDiffInstallStatusTest) { ASSERT_TRUE(CreateApKey(work_item_list.get(), L"")) << "Failed to create ap key."; GoogleUpdateSettings::UpdateDiffInstallStatus(false, true, - installer_util::FIRST_INSTALL_SUCCESS, + installer::FIRST_INSTALL_SUCCESS, kTestProductGuid); EXPECT_STREQ(ReadApKeyValue().c_str(), L""); work_item_list->Rollback(); @@ -344,7 +344,7 @@ TEST_F(GoogleUpdateSettingsTest, UpdateDiffInstallStatusTest) { ASSERT_TRUE(CreateApKey(work_item_list.get(), L"-full")) << "Failed to create ap key."; GoogleUpdateSettings::UpdateDiffInstallStatus(false, false, - installer_util::INSTALL_FAILED, + installer::INSTALL_FAILED, kTestProductGuid); EXPECT_STREQ(ReadApKeyValue().c_str(), L""); work_item_list->Rollback(); @@ -354,7 +354,7 @@ TEST_F(GoogleUpdateSettingsTest, UpdateDiffInstallStatusTest) { ASSERT_TRUE(CreateApKey(work_item_list.get(), L"-full")) << "Failed to create ap key."; GoogleUpdateSettings::UpdateDiffInstallStatus(false, false, - installer_util::FIRST_INSTALL_SUCCESS, + installer::FIRST_INSTALL_SUCCESS, kTestProductGuid); EXPECT_STREQ(ReadApKeyValue().c_str(), L""); work_item_list->Rollback(); @@ -374,12 +374,12 @@ TEST_F(GoogleUpdateSettingsTest, UpdateDiffInstallStatusTest) { } // try differential installer GoogleUpdateSettings::UpdateDiffInstallStatus(false, true, - installer_util::INSTALL_FAILED, + installer::INSTALL_FAILED, kTestProductGuid); EXPECT_STREQ(ReadApKeyValue().c_str(), L"-full"); // try full installer now GoogleUpdateSettings::UpdateDiffInstallStatus(false, false, - installer_util::INSTALL_FAILED, + installer::INSTALL_FAILED, kTestProductGuid); EXPECT_STREQ(ReadApKeyValue().c_str(), L""); // Now cleanup to leave the system in unchanged state. |