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

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

Issue 2618583005: Remove support for non-browser products from InstallationState and ProductState. (Closed)
Patch Set: fix Created 3 years, 11 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/util/google_update_settings.h" 5 #include "chrome/installer/util/google_update_settings.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <shlwapi.h> // For SHDeleteKey. 8 #include <shlwapi.h> // For SHDeleteKey.
9 #include <stddef.h> 9 #include <stddef.h>
10 10
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 } 582 }
583 } 583 }
584 584
585 TEST_F(GoogleUpdateSettingsTest, SetEULAConsent) { 585 TEST_F(GoogleUpdateSettingsTest, SetEULAConsent) {
586 using installer::FakeInstallationState; 586 using installer::FakeInstallationState;
587 587
588 const bool system_level = true; 588 const bool system_level = true;
589 FakeInstallationState machine_state; 589 FakeInstallationState machine_state;
590 590
591 // Chrome is installed. 591 // Chrome is installed.
592 machine_state.AddChrome(system_level, false /* !multi_install */, 592 machine_state.AddChrome(system_level,
593 new base::Version(chrome::kChromeVersion)); 593 new base::Version(chrome::kChromeVersion));
594 594
595 RegKey key; 595 RegKey key;
596 DWORD value; 596 DWORD value;
597 BrowserDistribution* chrome = BrowserDistribution::GetDistribution(); 597 BrowserDistribution* chrome = BrowserDistribution::GetDistribution();
598 598
599 // eulaconsent is set on the product. 599 // eulaconsent is set on the product.
600 EXPECT_TRUE(GoogleUpdateSettings::SetEULAConsent(machine_state, chrome, 600 EXPECT_TRUE(GoogleUpdateSettings::SetEULAConsent(machine_state, chrome,
601 true)); 601 true));
602 EXPECT_EQ(ERROR_SUCCESS, 602 EXPECT_EQ(ERROR_SUCCESS,
(...skipping 852 matching lines...) Expand 10 before | Expand all | Expand 10 after
1455 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL, 1455 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
1456 StatsState::FALSE_SETTING, StatsState::FALSE_SETTING), 1456 StatsState::FALSE_SETTING, StatsState::FALSE_SETTING),
1457 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL, 1457 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
1458 StatsState::FALSE_SETTING, StatsState::TRUE_SETTING), 1458 StatsState::FALSE_SETTING, StatsState::TRUE_SETTING),
1459 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL, 1459 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
1460 StatsState::TRUE_SETTING, StatsState::NO_SETTING), 1460 StatsState::TRUE_SETTING, StatsState::NO_SETTING),
1461 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL, 1461 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
1462 StatsState::TRUE_SETTING, StatsState::FALSE_SETTING), 1462 StatsState::TRUE_SETTING, StatsState::FALSE_SETTING),
1463 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL, 1463 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
1464 StatsState::TRUE_SETTING, StatsState::TRUE_SETTING))); 1464 StatsState::TRUE_SETTING, StatsState::TRUE_SETTING)));
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698