| 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 // 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 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 375 ValidateSetupPath(ctx, cmd_line.GetProgram(), name, is_valid); | 375 ValidateSetupPath(ctx, cmd_line.GetProgram(), name, is_valid); |
| 376 | 376 |
| 377 SwitchExpectations expected; | 377 SwitchExpectations expected; |
| 378 | 378 |
| 379 expected.push_back(std::make_pair( | 379 expected.push_back(std::make_pair( |
| 380 std::string(switches::kChromeAppLauncher), true)); | 380 std::string(switches::kChromeAppLauncher), true)); |
| 381 expected.push_back(std::make_pair( | 381 expected.push_back(std::make_pair( |
| 382 std::string(switches::kSystemLevel), false)); | 382 std::string(switches::kSystemLevel), false)); |
| 383 expected.push_back(std::make_pair( | 383 expected.push_back(std::make_pair( |
| 384 std::string(switches::kMultiInstall), true)); | 384 std::string(switches::kMultiInstall), true)); |
| 385 expected.push_back(std::make_pair( | |
| 386 std::string(switches::kEnsureGoogleUpdatePresent), true)); | |
| 387 | 385 |
| 388 ValidateCommandExpectations(ctx, cmd_line, expected, name, is_valid); | 386 ValidateCommandExpectations(ctx, cmd_line, expected, name, is_valid); |
| 389 | 387 |
| 390 std::set<string16> flags_exp; | 388 std::set<string16> flags_exp; |
| 391 flags_exp.insert(google_update::kRegSendsPingsField); | 389 flags_exp.insert(google_update::kRegSendsPingsField); |
| 392 flags_exp.insert(google_update::kRegWebAccessibleField); | 390 flags_exp.insert(google_update::kRegWebAccessibleField); |
| 393 flags_exp.insert(google_update::kRegRunAsUserField); | 391 flags_exp.insert(google_update::kRegRunAsUserField); |
| 394 ValidateAppCommandFlags(ctx, app_cmd, flags_exp, name, is_valid); | 392 ValidateAppCommandFlags(ctx, app_cmd, flags_exp, name, is_valid); |
| 395 } | 393 } |
| 396 | 394 |
| (...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 892 InstallationType* type) { | 890 InstallationType* type) { |
| 893 DCHECK(type); | 891 DCHECK(type); |
| 894 InstallationState machine_state; | 892 InstallationState machine_state; |
| 895 | 893 |
| 896 machine_state.Initialize(); | 894 machine_state.Initialize(); |
| 897 | 895 |
| 898 return ValidateInstallationTypeForState(machine_state, system_level, type); | 896 return ValidateInstallationTypeForState(machine_state, system_level, type); |
| 899 } | 897 } |
| 900 | 898 |
| 901 } // namespace installer | 899 } // namespace installer |
| OLD | NEW |