diff options
| author | Peter Kasting <pkasting@google.com> | 2014-11-20 15:14:08 -0800 |
|---|---|---|
| committer | Peter Kasting <pkasting@google.com> | 2014-11-20 23:16:57 +0000 |
| commit | be940e9e152e528fc567c4eeeeb5930710873f98 (patch) | |
| tree | 8496f9708b39b9ed106be20043e2e37d6ab58eb0 /chrome/installer/util | |
| parent | ce6760690b52af662b5684f24dca6edc20832edf (diff) | |
| download | chromium_src-be940e9e152e528fc567c4eeeeb5930710873f98.zip chromium_src-be940e9e152e528fc567c4eeeeb5930710873f98.tar.gz chromium_src-be940e9e152e528fc567c4eeeeb5930710873f98.tar.bz2 | |
Enable MSVC warning for unused locals.
There is seemingly a bug in the compiler where it occasionally claims a local is
unused when it isn't. This forces a few places to either inline such locals or
mark them ALLOW_UNUSED_LOCAL.
BUG=81439
TEST=none
R=brettw@chromium.org, cpu@chromium.org, jamesr@chromium.org, rvargas@chromium.org, sievers@chromium.org, sky@chromium.org, vitalybuka@chromium.org, wolenetz@chromium.org
Review URL: https://codereview.chromium.org/731373002
Cr-Commit-Position: refs/heads/master@{#305108}
Diffstat (limited to 'chrome/installer/util')
| -rw-r--r-- | chrome/installer/util/installation_validator.cc | 6 | ||||
| -rw-r--r-- | chrome/installer/util/installer_state_unittest.cc | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/chrome/installer/util/installation_validator.cc b/chrome/installer/util/installation_validator.cc index 6a982b8..be5959a 100644 --- a/chrome/installer/util/installation_validator.cc +++ b/chrome/installer/util/installation_validator.cc @@ -29,9 +29,6 @@ BrowserDistribution::Type void InstallationValidator::ChromeRules::AddUninstallSwitchExpectations( const ProductContext& ctx, SwitchExpectations* expectations) const { - const bool is_multi_install = - ctx.state.uninstall_command().HasSwitch(switches::kMultiInstall); - // --chrome should be present for uninstall iff --multi-install. This wasn't // the case in Chrome 10 (between r68996 and r72497), though, so consider it // optional. @@ -40,9 +37,6 @@ void InstallationValidator::ChromeRules::AddUninstallSwitchExpectations( void InstallationValidator::ChromeRules::AddRenameSwitchExpectations( const ProductContext& ctx, SwitchExpectations* expectations) const { - const bool is_multi_install = - ctx.state.uninstall_command().HasSwitch(switches::kMultiInstall); - // --chrome should not be present for rename. It was for a time, so we'll be // lenient so that mini_installer tests pass. diff --git a/chrome/installer/util/installer_state_unittest.cc b/chrome/installer/util/installer_state_unittest.cc index e9a19a4b..4faaee0 100644 --- a/chrome/installer/util/installer_state_unittest.cc +++ b/chrome/installer/util/installer_state_unittest.cc @@ -374,7 +374,6 @@ TEST_F(InstallerStateTest, WithProduct) { TEST_F(InstallerStateTest, InstallerResult) { const bool system_level = true; - bool multi_install = false; HKEY root = system_level ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER; RegKey key; |