Mike's change.

chrome/installer/gcapi/gcapi_reactivation_test.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/basictypes.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/test/test_reg_util_win.h"
@@ skipping 60 matching lines @@
     path += L"\\";
     path += google_update::kChromeUpgradeCode;
 
     RegKey client_state(hive, path.c_str(), KEY_SET_VALUE);
     return (client_state.Valid() &&
             client_state.WriteValue(
                 google_update::kRegLastRunTimeField,
                 last_run_time_string.c_str()) == ERROR_SUCCESS);
   }
 
-  bool HasExperimentLabels() {
+  bool HasExperimentLabels(HKEY hive) {
     int label_count = 0;
     for (int i = 0; i < arraysize(kExperimentAppGuids); ++i) {
       string16 client_state_path(google_update::kRegPathClientState);
       client_state_path += L"\\";
       client_state_path += kExperimentAppGuids[i];
 
-      RegKey client_state_key(HKEY_LOCAL_MACHINE,
+      RegKey client_state_key(hive,
                               client_state_path.c_str(),
                               KEY_QUERY_VALUE);
       if (client_state_key.Valid() &&
           client_state_key.HasValue(kExperimentLabels)) {
         label_count++;
       }
     }
     return label_count == arraysize(kExperimentAppGuids);
   }
 
@@ skipping 16 matching lines @@
     }
 
     return L"ERROR";
   }
 
  private:
   registry_util::RegistryOverrideManager override_manager_;
 };
 
 TEST_F(GCAPIReactivationTest, CheckSetReactivationBrandCode) {
-  EXPECT_TRUE(SetReactivationBrandCode(L"GAGA"));
+  EXPECT_TRUE(SetReactivationBrandCode(L"GAGA", GCAPI_INVOKED_STANDARD_SHELL));
   EXPECT_EQ(L"GAGA", GetReactivationString(HKEY_CURRENT_USER));
 
   std::vector<std::wstring> check_codes;
   check_codes.push_back(L"GAGA");
   EXPECT_TRUE(HasBeenReactivatedByBrandCodes(check_codes));
 
   check_codes.push_back(L"GOOGOO");
   EXPECT_TRUE(HasBeenReactivatedByBrandCodes(check_codes));
 
   check_codes.erase(check_codes.begin());
   EXPECT_FALSE(HasBeenReactivatedByBrandCodes(check_codes));
 }
 
 TEST_F(GCAPIReactivationTest, CanOfferReactivation_Basic) {
   const wchar_t* previous_brands[] = {L"GOOGOO", L"MAMA", L"DADA"};
   DWORD error;
 
   // We're not installed yet. Make sure CanOfferReactivation fails.
   EXPECT_FALSE(CanOfferReactivation(L"GAGA", arraysize(previous_brands),
-                                    previous_brands, &error));
+                                    previous_brands,
+                                    GCAPI_INVOKED_STANDARD_SHELL,
+                                    &error));
   EXPECT_EQ(REACTIVATE_ERROR_NOTINSTALLED, error);
 
   // Now pretend to be installed. CanOfferReactivation should pass.
   EXPECT_TRUE(SetChromeInstallMarker(HKEY_CURRENT_USER));
   EXPECT_TRUE(CanOfferReactivation(L"GAGA", arraysize(previous_brands),
-                                   previous_brands, &error));
+                                   previous_brands,
+                                   GCAPI_INVOKED_STANDARD_SHELL,
+                                   &error));
 
   // Now set a recent last_run value. CanOfferReactivation should fail again.
   Time hkcu_last_run = Time::NowFromSystemTime() - TimeDelta::FromDays(20);
   EXPECT_TRUE(SetLastRunTime(HKEY_CURRENT_USER,
                              hkcu_last_run.ToInternalValue()));
   EXPECT_FALSE(CanOfferReactivation(L"GAGA", arraysize(previous_brands),
-                                    previous_brands, &error));
+                                    previous_brands,
+                                    GCAPI_INVOKED_STANDARD_SHELL,
+                                    &error));
   EXPECT_EQ(REACTIVATE_ERROR_NOTDORMANT, error);
 
   // Now set a last_run value that exceeds the threshold.
   hkcu_last_run = Time::NowFromSystemTime() -
       TimeDelta::FromDays(kReactivationMinDaysDormant);
   EXPECT_TRUE(SetLastRunTime(HKEY_CURRENT_USER,
                              hkcu_last_run.ToInternalValue()));
   EXPECT_TRUE(CanOfferReactivation(L"GAGA", arraysize(previous_brands),
-                                   previous_brands, &error));
+                                   previous_brands,
+                                   GCAPI_INVOKED_STANDARD_SHELL,
+                                   &error));
 
   // Test some invalid inputs
   EXPECT_FALSE(CanOfferReactivation(NULL, arraysize(previous_brands),
-                                    previous_brands, &error));
+                                    previous_brands,
+                                    GCAPI_INVOKED_STANDARD_SHELL,
+                                    &error));
   EXPECT_EQ(REACTIVATE_ERROR_INVALID_INPUT, error);
   EXPECT_FALSE(CanOfferReactivation(L"GAGA", arraysize(previous_brands),
-                                    NULL, &error));
+                                    NULL, GCAPI_INVOKED_STANDARD_SHELL,
+                                    &error));
   EXPECT_EQ(REACTIVATE_ERROR_INVALID_INPUT, error);
 
   // One more valid one
-  EXPECT_TRUE(CanOfferReactivation(L"GAGA", 0, NULL, &error));
+  EXPECT_TRUE(CanOfferReactivation(L"GAGA", 0, NULL,
+                                   GCAPI_INVOKED_STANDARD_SHELL,
+                                   &error));
 
   // Check that the previous brands check works:
-  EXPECT_TRUE(SetReactivationBrandCode(L"GOOGOO"));
+  EXPECT_TRUE(SetReactivationBrandCode(L"GOOGOO",
+                                       GCAPI_INVOKED_STANDARD_SHELL));
   EXPECT_FALSE(CanOfferReactivation(L"GAGA", arraysize(previous_brands),
-                                    previous_brands, &error));
+                                    previous_brands,
+                                    GCAPI_INVOKED_STANDARD_SHELL,
+                                    &error));
   EXPECT_EQ(REACTIVATE_ERROR_ALREADY_REACTIVATED, error);
 }
 
 TEST_F(GCAPIReactivationTest, Reactivation_Flow) {
   const wchar_t* previous_brands[] = {L"GOOGOO", L"MAMA", L"DADA"};
   DWORD error;
 
   // Set us up as a candidate for reactivation.
   EXPECT_TRUE(SetChromeInstallMarker(HKEY_CURRENT_USER));
 
   Time hkcu_last_run = Time::NowFromSystemTime() -
       TimeDelta::FromDays(kReactivationMinDaysDormant);
   EXPECT_TRUE(SetLastRunTime(HKEY_CURRENT_USER,
                              hkcu_last_run.ToInternalValue()));
 
   EXPECT_TRUE(ReactivateChrome(L"GAGA", arraysize(previous_brands),
-                               previous_brands, &error));
+                               previous_brands, GCAPI_INVOKED_STANDARD_SHELL,
+                               &error));
   EXPECT_EQ(L"GAGA", GetReactivationString(HKEY_CURRENT_USER));
 
   // Make sure we can't reactivate again:
   EXPECT_FALSE(ReactivateChrome(L"GAGA", arraysize(previous_brands),
-                                previous_brands, &error));
+                                previous_brands, GCAPI_INVOKED_STANDARD_SHELL,
+                                &error));
   EXPECT_EQ(REACTIVATE_ERROR_ALREADY_REACTIVATED, error);
 
   // Should still be able to reactivate under other brands:
   EXPECT_TRUE(ReactivateChrome(L"MAMA", arraysize(previous_brands),
-                               previous_brands, &error));
+                               previous_brands, GCAPI_INVOKED_STANDARD_SHELL,
+                               &error));
   EXPECT_EQ(L"MAMA", GetReactivationString(HKEY_CURRENT_USER));
 
   // Validate that previous_brands are rejected:
   EXPECT_FALSE(ReactivateChrome(L"PFFT", arraysize(previous_brands),
-                                previous_brands, &error));
+                                previous_brands, GCAPI_INVOKED_STANDARD_SHELL,
+                                &error));
   EXPECT_EQ(REACTIVATE_ERROR_ALREADY_REACTIVATED, error);
   EXPECT_EQ(L"MAMA", GetReactivationString(HKEY_CURRENT_USER));
 }
 
 TEST_F(GCAPIReactivationTest, ExperimentLabelCheck) {
   const wchar_t* previous_brands[] = {L"GOOGOO", L"MAMA", L"DADA"};
   DWORD error;
 
   // Set us up as a candidate for reactivation.
   EXPECT_TRUE(SetChromeInstallMarker(HKEY_CURRENT_USER));
 
   Time hkcu_last_run = Time::NowFromSystemTime() -
       TimeDelta::FromDays(kReactivationMinDaysDormant);
   EXPECT_TRUE(SetLastRunTime(HKEY_CURRENT_USER,
                              hkcu_last_run.ToInternalValue()));
 
   EXPECT_TRUE(ReactivateChrome(L"GAGA", arraysize(previous_brands),
-                               previous_brands, &error));
+                               previous_brands, GCAPI_INVOKED_STANDARD_SHELL,
+                               &error));
   EXPECT_EQ(L"GAGA", GetReactivationString(HKEY_CURRENT_USER));
 
-  EXPECT_TRUE(HasExperimentLabels());
+  EXPECT_TRUE(HasExperimentLabels(HKEY_CURRENT_USER));
 }