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/channel_info_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/channel_info_unittest.cc')
| -rw-r--r-- | chrome/installer/util/channel_info_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/installer/util/channel_info_unittest.cc b/chrome/installer/util/channel_info_unittest.cc index ac3350e..f5ea4bb 100644 --- a/chrome/installer/util/channel_info_unittest.cc +++ b/chrome/installer/util/channel_info_unittest.cc @@ -14,7 +14,7 @@ const std::wstring kChannelDev(L"dev"); } // namespace TEST(ChannelInfoTest, Channels) { - installer_util::ChannelInfo ci; + installer::ChannelInfo ci; std::wstring channel; ci.set_value(L""); @@ -55,7 +55,7 @@ TEST(ChannelInfoTest, Channels) { } TEST(ChannelInfoTest, CEEE) { - installer_util::ChannelInfo ci; + installer::ChannelInfo ci; ci.set_value(L""); EXPECT_TRUE(ci.SetCeee(true)); @@ -87,7 +87,7 @@ TEST(ChannelInfoTest, CEEE) { } TEST(ChannelInfoTest, FullInstall) { - installer_util::ChannelInfo ci; + installer::ChannelInfo ci; ci.set_value(L""); EXPECT_TRUE(ci.SetFullInstall(true)); @@ -119,7 +119,7 @@ TEST(ChannelInfoTest, FullInstall) { } TEST(ChannelInfoTest, MultiInstall) { - installer_util::ChannelInfo ci; + installer::ChannelInfo ci; ci.set_value(L""); EXPECT_TRUE(ci.SetMultiInstall(true)); |