Merge 242400 "Remove installation of Chrome Frame."

chrome/installer/setup/install_worker_unittest.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 "chrome/installer/setup/install_worker.h"
 
 #include "base/win/registry.h"
 #include "base/version.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/installer/setup/setup_util.h"
@@ skipping 500 matching lines @@
   StrictMock<MockWorkItemList> work_item_list;
 
   EXPECT_CALL(work_item_list,
               AddDeleteRegKeyWorkItem(root_key_, StrEq(old_elevation_key)))
       .Times(1);
 
   AddDeleteOldIELowRightsPolicyWorkItems(*installer_state_.get(),
                                          &work_item_list);
 }
 
-TEST_P(OldIELowRightsTests, AddCopyIELowRightsPolicyWorkItems) {
-  StrictMock<MockWorkItemList> work_item_list;
-
-  // The old elevation policy key should only be copied when there's no old
-  // value.
-  EXPECT_CALL(work_item_list,
-              AddCopyRegKeyWorkItem(root_key_, StrEq(elevation_key),
-                                    StrEq(old_elevation_key),
-                                    Eq(WorkItem::IF_NOT_PRESENT))).Times(1);
-
-  AddCopyIELowRightsPolicyWorkItems(*installer_state_.get(), &work_item_list);
-}
-
 INSTANTIATE_TEST_CASE_P(Variations, OldIELowRightsTests,
                         Combine(Bool(), Bool()));
 
 TEST_F(InstallWorkerTest, GoogleUpdateWorkItemsTest) {
   const bool system_level = true;
   const bool multi_install = true;
   MockWorkItemList work_item_list;
 
   scoped_ptr<MockInstallationState> installation_state(
       BuildChromeInstallationState(system_level, false));
@@ skipping 254 matching lines @@
               prod_type_list[i_type_check]);
           bool prod_expect = (mach_after & (1 << i_type_check)) != 0;
           EXPECT_EQ(prod_expect, prod_res);
         }
       }
     }
   }
 }
 
 #endif  // defined(GOOGLE_CHROME_BUILD)