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

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 f5ea4bb..ac3350e 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::ChannelInfo ci;
+  installer_util::ChannelInfo ci;
   std::wstring channel;
 
   ci.set_value(L"");
@@ -55,7 +55,7 @@ TEST(ChannelInfoTest, Channels) {
 }
 
 TEST(ChannelInfoTest, CEEE) {
-  installer::ChannelInfo ci;
+  installer_util::ChannelInfo ci;
 
   ci.set_value(L"");
   EXPECT_TRUE(ci.SetCeee(true));
@@ -87,7 +87,7 @@ TEST(ChannelInfoTest, CEEE) {
 }
 
 TEST(ChannelInfoTest, FullInstall) {
-  installer::ChannelInfo ci;
+  installer_util::ChannelInfo ci;
 
   ci.set_value(L"");
   EXPECT_TRUE(ci.SetFullInstall(true));
@@ -119,7 +119,7 @@ TEST(ChannelInfoTest, FullInstall) {
 }
 
 TEST(ChannelInfoTest, MultiInstall) {
-  installer::ChannelInfo ci;
+  installer_util::ChannelInfo ci;
 
   ci.set_value(L"");
   EXPECT_TRUE(ci.SetMultiInstall(true));