Fix problem whereby the "-full" magic value is removed from the "ap" value wh...

chrome/installer/util/google_chrome_distribution_unittest.cc

Index: chrome/installer/util/google_chrome_distribution_unittest.cc
===================================================================
--- chrome/installer/util/google_chrome_distribution_unittest.cc	(revision 49062)
+++ chrome/installer/util/google_chrome_distribution_unittest.cc	(working copy)
@@ -6,185 +6,14 @@
 
 #include <windows.h>
 
-#include "base/registry.h"
 #include "base/scoped_ptr.h"
-#include "base/file_util.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_chrome_distribution.h"
-#include "chrome/installer/util/work_item_list.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace {
-class GoogleChromeDistributionTest : public testing::Test {
- protected:
-  virtual void SetUp() {
-    // Currently no setup required.
-  }
-
-  virtual void TearDown() {
-    // Currently no tear down required.
-  }
-
-  // Creates "ap" key with the value given as parameter. Also adds work
-  // items to work_item_list given so that they can be rolled back later.
-  bool CreateApKey(WorkItemList* work_item_list, const std::wstring& value) {
-    HKEY reg_root = HKEY_CURRENT_USER;
-    std::wstring reg_key = GetApKeyPath();
-    work_item_list->AddCreateRegKeyWorkItem(reg_root, reg_key);
-    work_item_list->AddSetRegValueWorkItem(reg_root, reg_key,
-        google_update::kRegApField, value.c_str(), true);
-    if (!work_item_list->Do()) {
-      work_item_list->Rollback();
-      return false;
-    }
-    return true;
-  }
-
-  // Returns the key path of "ap" key Google\Update\ClientState\<chrome-guid>
-  std::wstring GetApKeyPath() {
-    std::wstring reg_key(google_update::kRegPathClientState);
-    reg_key.append(L"\\");
-
-    BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-    reg_key.append(dist->GetAppGuid());
-    return reg_key;
-  }
-
-  // Utility method to read "ap" key value
-  std::wstring ReadApKeyValue() {
-    RegKey key;
-    std::wstring ap_key_value;
-    std::wstring reg_key = GetApKeyPath();
-    if (key.Open(HKEY_CURRENT_USER, reg_key.c_str(), KEY_ALL_ACCESS) &&
-        key.ReadValue(google_update::kRegApField, &ap_key_value)) {
-      return ap_key_value;
-    }
-    return std::wstring();
-  }
-};
-}  // namespace
-
-#if defined(GOOGLE_CHROME_BUILD)
-TEST_F(GoogleChromeDistributionTest, GetNewGoogleUpdateApKeyTest) {
-  GoogleChromeDistribution* dist = static_cast<GoogleChromeDistribution*>(
-      BrowserDistribution::GetDistribution());
-  installer_util::InstallStatus s = installer_util::FIRST_INSTALL_SUCCESS;
-  installer_util::InstallStatus f = installer_util::INSTALL_FAILED;
-
-  // Incremental Installer that worked.
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(true, s, L""), L"");
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(true, s, L"1.1"), L"1.1");
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(true, s, L"1.1-dev"), L"1.1-dev");
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(true, s, L"-full"), L"");
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(true, s, L"1.1-full"), L"1.1");
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(true, s, L"1.1-dev-full"),
-            L"1.1-dev");
-
-  // Incremental Installer that failed.
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(true, f, L""), L"-full");
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(true, f, L"1.1"), L"1.1-full");
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(true, f, L"1.1-dev"),
-            L"1.1-dev-full");
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(true, f, L"-full"), L"-full");
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(true, f, L"1.1-full"), L"1.1-full");
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(true, f, L"1.1-dev-full"),
-            L"1.1-dev-full");
-
-  // Full Installer that worked.
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(false, s, L""), L"");
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(false, s, L"1.1"), L"1.1");
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(false, s, L"1.1-dev"), L"1.1-dev");
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(false, s, L"-full"), L"");
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(false, s, L"1.1-full"), L"1.1");
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(false, s, L"1.1-dev-full"),
-            L"1.1-dev");
-
-  // Full Installer that failed.
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(false, f, L""), L"");
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(false, f, L"1.1"), L"1.1");
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(false, f, L"1.1-dev"), L"1.1-dev");
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(false, f, L"-full"), L"");
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(false, f, L"1.1-full"), L"1.1");
-  EXPECT_EQ(dist->GetNewGoogleUpdateApKey(false, f, L"1.1-dev-full"),
-            L"1.1-dev");
-}
-
-TEST_F(GoogleChromeDistributionTest, UpdateDiffInstallStatusTest) {
-  // Get Google Chrome distribution
-  GoogleChromeDistribution* dist = static_cast<GoogleChromeDistribution*>(
-      BrowserDistribution::GetDistribution());
-
-  scoped_ptr<WorkItemList> work_item_list(WorkItem::CreateWorkItemList());
-  // Test incremental install failure
-  if (!CreateApKey(work_item_list.get(), L""))
-    FAIL() << "Failed to create ap key.";
-  dist->UpdateDiffInstallStatus(false, true, installer_util::INSTALL_FAILED);
-  EXPECT_STREQ(ReadApKeyValue().c_str(), L"-full");
-  work_item_list->Rollback();
-
-  work_item_list.reset(WorkItem::CreateWorkItemList());
-  // Test incremental install success
-  if (!CreateApKey(work_item_list.get(), L""))
-    FAIL() << "Failed to create ap key.";
-  dist->UpdateDiffInstallStatus(false, true,
-                                installer_util::FIRST_INSTALL_SUCCESS);
-  EXPECT_STREQ(ReadApKeyValue().c_str(), L"");
-  work_item_list->Rollback();
-
-  work_item_list.reset(WorkItem::CreateWorkItemList());
-  // Test full install failure
-  if (!CreateApKey(work_item_list.get(), L"-full"))
-    FAIL() << "Failed to create ap key.";
-  dist->UpdateDiffInstallStatus(false, false, installer_util::INSTALL_FAILED);
-  EXPECT_STREQ(ReadApKeyValue().c_str(), L"");
-  work_item_list->Rollback();
-
-  work_item_list.reset(WorkItem::CreateWorkItemList());
-  // Test full install success
-  if (!CreateApKey(work_item_list.get(), L"-full"))
-    FAIL() << "Failed to create ap key.";
-  dist->UpdateDiffInstallStatus(false, false,
-                                installer_util::FIRST_INSTALL_SUCCESS);
-  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);
-    if (!work_item_list->Do())
-      FAIL() << "Failed to create ClientState key.";
-  } else if (key.DeleteValue(google_update::kRegApField)) {
-    ap_key_deleted = true;
-  }
-  // try differential installer
-  dist->UpdateDiffInstallStatus(false, true, installer_util::INSTALL_FAILED);
-  EXPECT_STREQ(ReadApKeyValue().c_str(), L"-full");
-  // try full installer now
-  dist->UpdateDiffInstallStatus(false, false, installer_util::INSTALL_FAILED);
-  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());
-    if (!CreateApKey(work_item_list.get(), ap_key_value))
-      FAIL() << "Failed to restore ap key.";
-  }
-}
-
-TEST_F(GoogleChromeDistributionTest, TestExtractUninstallMetrics) {
+TEST(GoogleChromeDistributionTest, TestExtractUninstallMetrics) {
   // A make-believe JSON preferences file.
   std::string pref_string(
       "{ \n"
@@ -228,4 +57,3 @@
                                     &uninstall_metrics_string));
   EXPECT_EQ(expected_url_string, uninstall_metrics_string);
 }
-#endif