| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 // Implementation of the installation validator. | 5 // Implementation of the installation validator. |
| 6 | 6 |
| 7 #include "chrome/installer/util/installation_validator.h" | 7 #include "chrome/installer/util/installation_validator.h" |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 390 ValidateSetupPath(ctx, command.GetProgram(), "in-use renamer", is_valid); | 390 ValidateSetupPath(ctx, command.GetProgram(), "in-use renamer", is_valid); |
| 391 | 391 |
| 392 SwitchExpectations expected; | 392 SwitchExpectations expected; |
| 393 | 393 |
| 394 expected.push_back(std::make_pair(std::string(switches::kRenameChromeExe), | 394 expected.push_back(std::make_pair(std::string(switches::kRenameChromeExe), |
| 395 true)); | 395 true)); |
| 396 expected.push_back(std::make_pair(std::string(switches::kSystemLevel), | 396 expected.push_back(std::make_pair(std::string(switches::kSystemLevel), |
| 397 ctx.system_install)); | 397 ctx.system_install)); |
| 398 expected.push_back(std::make_pair(std::string(switches::kMultiInstall), | 398 expected.push_back(std::make_pair(std::string(switches::kMultiInstall), |
| 399 ctx.state.is_multi_install())); | 399 ctx.state.is_multi_install())); |
| 400 ctx.rules.AddProductSwitchExpectations(ctx.machine_state, | |
| 401 ctx.system_install, | |
| 402 ctx.state, &expected); | |
| 403 | 400 |
| 404 ValidateCommandExpectations(ctx, command, expected, "in-use renamer", | 401 ValidateCommandExpectations(ctx, command, expected, "in-use renamer", |
| 405 is_valid); | 402 is_valid); |
| 406 } | 403 } |
| 407 | 404 |
| 408 // Validates the "opv" and "cmd" values for the product described in |ctx|. | 405 // Validates the "opv" and "cmd" values for the product described in |ctx|. |
| 409 void InstallationValidator::ValidateOldVersionValues( | 406 void InstallationValidator::ValidateOldVersionValues( |
| 410 const ProductContext& ctx, | 407 const ProductContext& ctx, |
| 411 bool* is_valid) { | 408 bool* is_valid) { |
| 412 DCHECK(is_valid); | 409 DCHECK(is_valid); |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 580 InstallationType* type) { | 577 InstallationType* type) { |
| 581 DCHECK(type); | 578 DCHECK(type); |
| 582 InstallationState machine_state; | 579 InstallationState machine_state; |
| 583 | 580 |
| 584 machine_state.Initialize(); | 581 machine_state.Initialize(); |
| 585 | 582 |
| 586 return ValidateInstallationTypeForState(machine_state, system_level, type); | 583 return ValidateInstallationTypeForState(machine_state, system_level, type); |
| 587 } | 584 } |
| 588 | 585 |
| 589 } // namespace installer | 586 } // namespace installer |
| OLD | NEW |