diff options
author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 20:32:00 +0000 |
---|---|---|
committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 20:32:00 +0000 |
commit | 5ddd1eaaaaa5512ee780789bfb0164a97bca933d (patch) | |
tree | d851d2b162561286fb86308415648ee6eee44984 /chrome/installer/setup/setup_util_unittest.cc | |
parent | befe84bbceb40e25af72c21aa6f8492d1eb7ae84 (diff) | |
download | chromium_src-5ddd1eaaaaa5512ee780789bfb0164a97bca933d.zip chromium_src-5ddd1eaaaaa5512ee780789bfb0164a97bca933d.tar.gz chromium_src-5ddd1eaaaaa5512ee780789bfb0164a97bca933d.tar.bz2 |
Revert 69165 - 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
TBR=robertshield@chromium.org
Review URL: http://codereview.chromium.org/5756007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69167 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/setup_util_unittest.cc')
-rw-r--r-- | chrome/installer/setup/setup_util_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/installer/setup/setup_util_unittest.cc b/chrome/installer/setup/setup_util_unittest.cc index 72e40ed..8161173 100644 --- a/chrome/installer/setup/setup_util_unittest.cc +++ b/chrome/installer/setup/setup_util_unittest.cc @@ -49,11 +49,11 @@ TEST_F(SetupUtilTest, ApplyDiffPatchTest) { FilePath src = data_dir_.AppendASCII("archive1.7z"); FilePath patch = data_dir_.AppendASCII("archive.diff"); FilePath dest = work_dir.AppendASCII("archive2.7z"); - EXPECT_EQ(installer::ApplyDiffPatch(src, patch, dest), 0); + EXPECT_EQ(setup_util::ApplyDiffPatch(src, patch, dest), 0); FilePath base = data_dir_.AppendASCII("archive2.7z"); EXPECT_TRUE(file_util::ContentsEqual(dest, base)); - EXPECT_EQ(installer::ApplyDiffPatch(FilePath(), FilePath(), FilePath()), 6); + EXPECT_EQ(setup_util::ApplyDiffPatch(FilePath(), FilePath(), FilePath()), 6); } // Test that we are parsing Chrome version correctly. @@ -63,21 +63,21 @@ TEST_F(SetupUtilTest, GetVersionFromArchiveDirTest) { file_util::CreateDirectory(chrome_dir); ASSERT_TRUE(file_util::PathExists(chrome_dir)); scoped_ptr<installer::Version> version( - installer::GetVersionFromArchiveDir(test_dir_.path())); + setup_util::GetVersionFromArchiveDir(test_dir_.path())); ASSERT_TRUE(version->GetString() == L"1.0.0.0"); file_util::Delete(chrome_dir, true); ASSERT_FALSE(file_util::PathExists(chrome_dir)); - ASSERT_TRUE(installer::GetVersionFromArchiveDir(test_dir_.path()) == NULL); + ASSERT_TRUE(setup_util::GetVersionFromArchiveDir(test_dir_.path()) == NULL); chrome_dir = test_dir_.path().AppendASCII("ABC"); file_util::CreateDirectory(chrome_dir); ASSERT_TRUE(file_util::PathExists(chrome_dir)); - ASSERT_TRUE(installer::GetVersionFromArchiveDir(test_dir_.path()) == NULL); + ASSERT_TRUE(setup_util::GetVersionFromArchiveDir(test_dir_.path()) == NULL); chrome_dir = test_dir_.path().AppendASCII("2.3.4.5"); file_util::CreateDirectory(chrome_dir); ASSERT_TRUE(file_util::PathExists(chrome_dir)); - version.reset(installer::GetVersionFromArchiveDir(test_dir_.path())); + version.reset(setup_util::GetVersionFromArchiveDir(test_dir_.path())); ASSERT_TRUE(version->GetString() == L"2.3.4.5"); } |