Merge the installer, installer_util and setup_util namespaces into a single i...

chrome/installer/setup/setup_util_unittest.cc

Index: chrome/installer/setup/setup_util_unittest.cc
===================================================================
--- chrome/installer/setup/setup_util_unittest.cc	(revision 68996)
+++ chrome/installer/setup/setup_util_unittest.cc	(working copy)
@@ -49,11 +49,11 @@
   FilePath src = data_dir_.AppendASCII("archive1.7z");
   FilePath patch = data_dir_.AppendASCII("archive.diff");
   FilePath dest = work_dir.AppendASCII("archive2.7z");
-  EXPECT_EQ(setup_util::ApplyDiffPatch(src, patch, dest), 0);
+  EXPECT_EQ(installer::ApplyDiffPatch(src, patch, dest), 0);
   FilePath base = data_dir_.AppendASCII("archive2.7z");
   EXPECT_TRUE(file_util::ContentsEqual(dest, base));
 
-  EXPECT_EQ(setup_util::ApplyDiffPatch(FilePath(), FilePath(), FilePath()), 6);
+  EXPECT_EQ(installer::ApplyDiffPatch(FilePath(), FilePath(), FilePath()), 6);
 }
 
 // Test that we are parsing Chrome version correctly.
@@ -63,21 +63,21 @@
   file_util::CreateDirectory(chrome_dir);
   ASSERT_TRUE(file_util::PathExists(chrome_dir));
   scoped_ptr<installer::Version> version(
-      setup_util::GetVersionFromArchiveDir(test_dir_.path()));
+      installer::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(setup_util::GetVersionFromArchiveDir(test_dir_.path()) == NULL);
+  ASSERT_TRUE(installer::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(setup_util::GetVersionFromArchiveDir(test_dir_.path()) == NULL);
+  ASSERT_TRUE(installer::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(setup_util::GetVersionFromArchiveDir(test_dir_.path()));
+  version.reset(installer::GetVersionFromArchiveDir(test_dir_.path()));
   ASSERT_TRUE(version->GetString() == L"2.3.4.5");
 }