From befe84bbceb40e25af72c21aa6f8492d1eb7ae84 Mon Sep 17 00:00:00 2001 From: "robertshield@chromium.org" Date: Tue, 14 Dec 2010 20:23:49 +0000 Subject: 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 --- chrome/installer/util/channel_info_unittest.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chrome/installer/util/channel_info_unittest.cc') 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)); -- cgit v1.1