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

Side by Side Diff: chrome/installer/util/installation_validator_unittest.cc

Issue 1109043003: Apply automated fixits for Chrome clang plugin to chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « chrome/installer/util/html_dialog_impl.cc ('k') | chrome/installer/util/lzma_util_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <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
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
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));
OLDNEW
« no previous file with comments | « chrome/installer/util/html_dialog_impl.cc ('k') | chrome/installer/util/lzma_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698