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 #include <map> | 5 #include <map> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
270 Level install_level, | 270 Level install_level, |
271 Channel channel, | 271 Channel channel, |
272 Vehicle vehicle, | 272 Vehicle vehicle, |
273 FakeProductState* state); | 273 FakeProductState* state); |
274 static void MakeMachineState( | 274 static void MakeMachineState( |
275 InstallationValidator::InstallationType inst_type, | 275 InstallationValidator::InstallationType inst_type, |
276 Level install_level, | 276 Level install_level, |
277 Channel channel, | 277 Channel channel, |
278 Vehicle vehicle, | 278 Vehicle vehicle, |
279 FakeInstallationState* state); | 279 FakeInstallationState* state); |
280 virtual void TearDown(); | 280 void TearDown() override; |
281 | 281 |
282 static logging::LogMessageHandlerFunction old_log_message_handler_; | 282 static logging::LogMessageHandlerFunction old_log_message_handler_; |
283 static ValidationErrorRecipient* validation_error_recipient_; | 283 static ValidationErrorRecipient* validation_error_recipient_; |
284 static InstallationTypeToModifiers* type_to_modifiers_; | 284 static InstallationTypeToModifiers* type_to_modifiers_; |
285 }; | 285 }; |
286 | 286 |
287 // static | 287 // static |
288 logging::LogMessageHandlerFunction | 288 logging::LogMessageHandlerFunction |
289 InstallationValidatorTest::old_log_message_handler_ = NULL; | 289 InstallationValidatorTest::old_log_message_handler_ = NULL; |
290 | 290 |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
479 AllValidInstallations, | 479 AllValidInstallations, |
480 InstallationValidatorTest, | 480 InstallationValidatorTest, |
481 Values(InstallationValidator::NO_PRODUCTS, | 481 Values(InstallationValidator::NO_PRODUCTS, |
482 InstallationValidator::CHROME_SINGLE, | 482 InstallationValidator::CHROME_SINGLE, |
483 InstallationValidator::CHROME_MULTI, | 483 InstallationValidator::CHROME_MULTI, |
484 InstallationValidator::CHROME_FRAME_SINGLE, | 484 InstallationValidator::CHROME_FRAME_SINGLE, |
485 InstallationValidator::CHROME_FRAME_SINGLE_CHROME_SINGLE, | 485 InstallationValidator::CHROME_FRAME_SINGLE_CHROME_SINGLE, |
486 InstallationValidator::CHROME_FRAME_SINGLE_CHROME_MULTI, | 486 InstallationValidator::CHROME_FRAME_SINGLE_CHROME_MULTI, |
487 InstallationValidator::CHROME_FRAME_MULTI, | 487 InstallationValidator::CHROME_FRAME_MULTI, |
488 InstallationValidator::CHROME_FRAME_MULTI_CHROME_MULTI)); | 488 InstallationValidator::CHROME_FRAME_MULTI_CHROME_MULTI)); |
OLD | NEW |