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

chrome/installer/util/google_update_settings_unittest.cc

Index: chrome/installer/util/google_update_settings_unittest.cc
===================================================================
--- chrome/installer/util/google_update_settings_unittest.cc	(revision 68996)
+++ chrome/installer/util/google_update_settings_unittest.cc	(working copy)
@@ -213,11 +213,11 @@
 }
 
 TEST_F(GoogleUpdateSettingsTest, UpdateGoogleUpdateApKey) {
-  installer_util::InstallStatus s = installer_util::FIRST_INSTALL_SUCCESS;
-  installer_util::InstallStatus f = installer_util::INSTALL_FAILED;
+  installer::InstallStatus s = installer::FIRST_INSTALL_SUCCESS;
+  installer::InstallStatus f = installer::INSTALL_FAILED;
 
   // Incremental Installer that worked.
-  installer_util::ChannelInfo v;
+  installer::ChannelInfo v;
   v.set_value(L"");
   EXPECT_FALSE(GoogleUpdateSettings::UpdateGoogleUpdateApKey(true, s, &v));
   EXPECT_EQ(v.value(), L"");
@@ -324,7 +324,7 @@
   ASSERT_TRUE(CreateApKey(work_item_list.get(), L""))
       << "Failed to create ap key.";
   GoogleUpdateSettings::UpdateDiffInstallStatus(false, true,
-                                       installer_util::INSTALL_FAILED,
+                                       installer::INSTALL_FAILED,
                                        kTestProductGuid);
   EXPECT_STREQ(ReadApKeyValue().c_str(), L"-full");
   work_item_list->Rollback();
@@ -334,7 +334,7 @@
   ASSERT_TRUE(CreateApKey(work_item_list.get(), L""))
       << "Failed to create ap key.";
   GoogleUpdateSettings::UpdateDiffInstallStatus(false, true,
-                                       installer_util::FIRST_INSTALL_SUCCESS,
+                                       installer::FIRST_INSTALL_SUCCESS,
                                        kTestProductGuid);
   EXPECT_STREQ(ReadApKeyValue().c_str(), L"");
   work_item_list->Rollback();
@@ -344,7 +344,7 @@
   ASSERT_TRUE(CreateApKey(work_item_list.get(), L"-full"))
       << "Failed to create ap key.";
   GoogleUpdateSettings::UpdateDiffInstallStatus(false, false,
-                                       installer_util::INSTALL_FAILED,
+                                       installer::INSTALL_FAILED,
                                        kTestProductGuid);
   EXPECT_STREQ(ReadApKeyValue().c_str(), L"");
   work_item_list->Rollback();
@@ -354,7 +354,7 @@
   ASSERT_TRUE(CreateApKey(work_item_list.get(), L"-full"))
       << "Failed to create ap key.";
   GoogleUpdateSettings::UpdateDiffInstallStatus(false, false,
-                                       installer_util::FIRST_INSTALL_SUCCESS,
+                                       installer::FIRST_INSTALL_SUCCESS,
                                        kTestProductGuid);
   EXPECT_STREQ(ReadApKeyValue().c_str(), L"");
   work_item_list->Rollback();
@@ -374,12 +374,12 @@
   }
   // try differential installer
   GoogleUpdateSettings::UpdateDiffInstallStatus(false, true,
-                                       installer_util::INSTALL_FAILED,
+                                       installer::INSTALL_FAILED,
                                        kTestProductGuid);
   EXPECT_STREQ(ReadApKeyValue().c_str(), L"-full");
   // try full installer now
   GoogleUpdateSettings::UpdateDiffInstallStatus(false, false,
-                                       installer_util::INSTALL_FAILED,
+                                       installer::INSTALL_FAILED,
                                        kTestProductGuid);
   EXPECT_STREQ(ReadApKeyValue().c_str(), L"");
   // Now cleanup to leave the system in unchanged state.