Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(158)

Side by Side Diff: chrome/installer/setup/install_worker_unittest.cc

Issue 627423002: Replacing the OVERRIDE with override in chrome/installer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Patch is rebased Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 } // namespace 484 } // namespace
485 485
486 // A test class for worker functions that manipulate the old IE low rights 486 // A test class for worker functions that manipulate the old IE low rights
487 // policies. 487 // policies.
488 // Parameters: 488 // Parameters:
489 // bool : system_level_ 489 // bool : system_level_
490 // bool : multi_install_ 490 // bool : multi_install_
491 class OldIELowRightsTests : public InstallWorkerTest, 491 class OldIELowRightsTests : public InstallWorkerTest,
492 public ::testing::WithParamInterface<std::tr1::tuple<bool, bool> > { 492 public ::testing::WithParamInterface<std::tr1::tuple<bool, bool> > {
493 protected: 493 protected:
494 virtual void SetUp() OVERRIDE { 494 virtual void SetUp() override {
495 InstallWorkerTest::SetUp(); 495 InstallWorkerTest::SetUp();
496 496
497 const ParamType& param = GetParam(); 497 const ParamType& param = GetParam();
498 system_level_ = std::tr1::get<0>(param); 498 system_level_ = std::tr1::get<0>(param);
499 multi_install_ = std::tr1::get<1>(param); 499 multi_install_ = std::tr1::get<1>(param);
500 root_key_ = system_level_ ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER; 500 root_key_ = system_level_ ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
501 501
502 installation_state_.reset(new MockInstallationState()); 502 installation_state_.reset(new MockInstallationState());
503 AddChromeFrameToInstallationState(system_level_, multi_install_, 503 AddChromeFrameToInstallationState(system_level_, multi_install_,
504 installation_state_.get()); 504 installation_state_.get());
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 prod_type_list[i_type_check]); 798 prod_type_list[i_type_check]);
799 bool prod_expect = (mach_after & (1 << i_type_check)) != 0; 799 bool prod_expect = (mach_after & (1 << i_type_check)) != 0;
800 EXPECT_EQ(prod_expect, prod_res); 800 EXPECT_EQ(prod_expect, prod_res);
801 } 801 }
802 } 802 }
803 } 803 }
804 } 804 }
805 } 805 }
806 806
807 #endif // defined(GOOGLE_CHROME_BUILD) 807 #endif // defined(GOOGLE_CHROME_BUILD)
OLDNEW
« no previous file with comments | « chrome/installer/setup/install_unittest.cc ('k') | chrome/installer/setup/setup_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698