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

chrome/installer/util/google_update_settings_unittest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <windows.h>
 #include <shlwapi.h>  // For SHDeleteKey.
 
 #include "base/scoped_ptr.h"
 #include "base/win/registry.h"
 #include "chrome/installer/util/browser_distribution.h"
@@ skipping 195 matching lines @@
 
 TEST_F(GoogleUpdateSettingsTest, CurrentChromeChannelVariousApValuesSystem) {
   TestCurrentChromeChannelWithVariousApValues(SYSTEM_INSTALL);
 }
 
 TEST_F(GoogleUpdateSettingsTest, CurrentChromeChannelVariousApValuesUser) {
   TestCurrentChromeChannelWithVariousApValues(USER_INSTALL);
 }
 
 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"");
 
   v.set_value(L"1.1");
   EXPECT_FALSE(GoogleUpdateSettings::UpdateGoogleUpdateApKey(true, s, &v));
   EXPECT_EQ(v.value(), L"1.1");
 
   v.set_value(L"1.1-dev");
   EXPECT_FALSE(GoogleUpdateSettings::UpdateGoogleUpdateApKey(true, s, &v));
@@ skipping 86 matching lines @@
   EXPECT_TRUE(GoogleUpdateSettings::UpdateGoogleUpdateApKey(false, f, &v));
   EXPECT_EQ(v.value(), L"1.1-dev");
 }
 
 TEST_F(GoogleUpdateSettingsTest, UpdateDiffInstallStatusTest) {
   scoped_ptr<WorkItemList> work_item_list(WorkItem::CreateWorkItemList());
   // Test incremental install failure
   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();
 
   work_item_list.reset(WorkItem::CreateWorkItemList());
   // Test incremental install success
   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();
 
   work_item_list.reset(WorkItem::CreateWorkItemList());
   // Test full install failure
   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();
 
   work_item_list.reset(WorkItem::CreateWorkItemList());
   // Test full install success
   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();
 
   work_item_list.reset(WorkItem::CreateWorkItemList());
   // Test the case of when "ap" key doesnt exist at all
   std::wstring ap_key_value = ReadApKeyValue();
   std::wstring reg_key = GetApKeyPath();
   HKEY reg_root = HKEY_CURRENT_USER;
   bool ap_key_deleted = false;
   RegKey key;
   if (!key.Open(HKEY_CURRENT_USER, reg_key.c_str(), KEY_ALL_ACCESS)) {
     work_item_list->AddCreateRegKeyWorkItem(reg_root, reg_key);
     ASSERT_TRUE(work_item_list->Do()) << "Failed to create ClientState key.";
   } else if (key.DeleteValue(google_update::kRegApField)) {
     ap_key_deleted = true;
   }
   // 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.
   // - Diff installer creates an ap key if it didnt exist, so delete this ap key
   // - If we created any reg key path for ap, roll it back
   // - Finally restore the original value of ap key.
   key.Open(HKEY_CURRENT_USER, reg_key.c_str(), KEY_ALL_ACCESS);
   key.DeleteValue(google_update::kRegApField);
   work_item_list->Rollback();
   if (ap_key_deleted) {
     work_item_list.reset(WorkItem::CreateWorkItemList());
     ASSERT_TRUE(CreateApKey(work_item_list.get(), ap_key_value))
         << "Failed to restore ap key.";
   }
 }