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

Side by Side Diff: chrome/installer/setup/setup_util_unittest.cc

Issue 575253002: Clean up unused param in RegistryOverrideManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix more callers Created 6 years, 3 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
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 "chrome/installer/setup/setup_util_unittest.h" 5 #include "chrome/installer/setup/setup_util_unittest.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 base::FilePath patch_source(installer::FindArchiveToPatch( 401 base::FilePath patch_source(installer::FindArchiveToPatch(
402 *original_state_, *installer_state_)); 402 *original_state_, *installer_state_));
403 EXPECT_EQ(base::FilePath::StringType(), patch_source.value()); 403 EXPECT_EQ(base::FilePath::StringType(), patch_source.value());
404 } 404 }
405 405
406 namespace { 406 namespace {
407 407
408 class MigrateMultiToSingleTest : public testing::Test { 408 class MigrateMultiToSingleTest : public testing::Test {
409 protected: 409 protected:
410 virtual void SetUp() OVERRIDE { 410 virtual void SetUp() OVERRIDE {
411 registry_override_manager_.OverrideRegistry(kRootKey, 411 registry_override_manager_.OverrideRegistry(kRootKey);
412 L"MigrateMultiToSingleTest");
413 } 412 }
414 413
415 static const bool kSystemLevel = false; 414 static const bool kSystemLevel = false;
416 static const HKEY kRootKey; 415 static const HKEY kRootKey;
417 static const wchar_t kVersionString[]; 416 static const wchar_t kVersionString[];
418 static const wchar_t kMultiChannel[]; 417 static const wchar_t kMultiChannel[];
419 registry_util::RegistryOverrideManager registry_override_manager_; 418 registry_util::RegistryOverrideManager registry_override_manager_;
420 }; 419 };
421 420
422 const bool MigrateMultiToSingleTest::kSystemLevel; 421 const bool MigrateMultiToSingleTest::kSystemLevel;
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 } 486 }
488 487
489 TEST(SetupUtilTest, ContainsUnsupportedSwitch) { 488 TEST(SetupUtilTest, ContainsUnsupportedSwitch) {
490 EXPECT_FALSE(installer::ContainsUnsupportedSwitch( 489 EXPECT_FALSE(installer::ContainsUnsupportedSwitch(
491 CommandLine::FromString(L"foo.exe"))); 490 CommandLine::FromString(L"foo.exe")));
492 EXPECT_FALSE(installer::ContainsUnsupportedSwitch( 491 EXPECT_FALSE(installer::ContainsUnsupportedSwitch(
493 CommandLine::FromString(L"foo.exe --multi-install --chrome"))); 492 CommandLine::FromString(L"foo.exe --multi-install --chrome")));
494 EXPECT_TRUE(installer::ContainsUnsupportedSwitch( 493 EXPECT_TRUE(installer::ContainsUnsupportedSwitch(
495 CommandLine::FromString(L"foo.exe --chrome-frame"))); 494 CommandLine::FromString(L"foo.exe --chrome-frame")));
496 } 495 }
OLDNEW
« no previous file with comments | « chrome/installer/gcapi/gcapi_test_registry_overrider.cc ('k') | chrome/installer/util/google_update_settings_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698