| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/installer/setup/install_worker.h" | 5 #include "chrome/installer/setup/install_worker.h" |
| 6 | 6 |
| 7 #include "base/win/registry.h" | 7 #include "base/win/registry.h" |
| 8 #include "base/version.h" | 8 #include "base/version.h" |
| 9 #include "chrome/common/chrome_constants.h" | 9 #include "chrome/common/chrome_constants.h" |
| 10 #include "chrome/installer/setup/setup_util.h" | 10 #include "chrome/installer/setup/setup_util.h" |
| (...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 523 StrictMock<MockWorkItemList> work_item_list; | 523 StrictMock<MockWorkItemList> work_item_list; |
| 524 | 524 |
| 525 EXPECT_CALL(work_item_list, | 525 EXPECT_CALL(work_item_list, |
| 526 AddDeleteRegKeyWorkItem(root_key_, StrEq(old_elevation_key))) | 526 AddDeleteRegKeyWorkItem(root_key_, StrEq(old_elevation_key))) |
| 527 .Times(1); | 527 .Times(1); |
| 528 | 528 |
| 529 AddDeleteOldIELowRightsPolicyWorkItems(*installer_state_.get(), | 529 AddDeleteOldIELowRightsPolicyWorkItems(*installer_state_.get(), |
| 530 &work_item_list); | 530 &work_item_list); |
| 531 } | 531 } |
| 532 | 532 |
| 533 TEST_P(OldIELowRightsTests, AddCopyIELowRightsPolicyWorkItems) { |
| 534 StrictMock<MockWorkItemList> work_item_list; |
| 535 |
| 536 // The old elevation policy key should only be copied when there's no old |
| 537 // value. |
| 538 EXPECT_CALL(work_item_list, |
| 539 AddCopyRegKeyWorkItem(root_key_, StrEq(elevation_key), |
| 540 StrEq(old_elevation_key), |
| 541 Eq(WorkItem::IF_NOT_PRESENT))).Times(1); |
| 542 |
| 543 AddCopyIELowRightsPolicyWorkItems(*installer_state_.get(), &work_item_list); |
| 544 } |
| 545 |
| 533 INSTANTIATE_TEST_CASE_P(Variations, OldIELowRightsTests, | 546 INSTANTIATE_TEST_CASE_P(Variations, OldIELowRightsTests, |
| 534 Combine(Bool(), Bool())); | 547 Combine(Bool(), Bool())); |
| 535 | 548 |
| 536 TEST_F(InstallWorkerTest, GoogleUpdateWorkItemsTest) { | 549 TEST_F(InstallWorkerTest, GoogleUpdateWorkItemsTest) { |
| 537 const bool system_level = true; | 550 const bool system_level = true; |
| 538 const bool multi_install = true; | 551 const bool multi_install = true; |
| 539 MockWorkItemList work_item_list; | 552 MockWorkItemList work_item_list; |
| 540 | 553 |
| 541 scoped_ptr<MockInstallationState> installation_state( | 554 scoped_ptr<MockInstallationState> installation_state( |
| 542 BuildChromeInstallationState(system_level, false)); | 555 BuildChromeInstallationState(system_level, false)); |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 797 prod_type_list[i_type_check]); | 810 prod_type_list[i_type_check]); |
| 798 bool prod_expect = (mach_after & (1 << i_type_check)) != 0; | 811 bool prod_expect = (mach_after & (1 << i_type_check)) != 0; |
| 799 EXPECT_EQ(prod_expect, prod_res); | 812 EXPECT_EQ(prod_expect, prod_res); |
| 800 } | 813 } |
| 801 } | 814 } |
| 802 } | 815 } |
| 803 } | 816 } |
| 804 } | 817 } |
| 805 | 818 |
| 806 #endif // defined(GOOGLE_CHROME_BUILD) | 819 #endif // defined(GOOGLE_CHROME_BUILD) |
| OLD | NEW |