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

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

Issue 2258243002: Consistently use namespaced base::Version in chrome/installer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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/google_update_settings.cc ('k') | chrome/installer/util/install_util.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 "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 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 multi_install = true; 588 const bool multi_install = true;
589 const bool system_level = true; 589 const bool system_level = true;
590 FakeInstallationState machine_state; 590 FakeInstallationState machine_state;
591 591
592 // Chrome is installed. 592 // Chrome is installed.
593 machine_state.AddChrome(system_level, multi_install, 593 machine_state.AddChrome(system_level, multi_install,
594 new Version(chrome::kChromeVersion)); 594 new base::Version(chrome::kChromeVersion));
595 595
596 RegKey key; 596 RegKey key;
597 DWORD value; 597 DWORD value;
598 BrowserDistribution* binaries = 598 BrowserDistribution* binaries =
599 BrowserDistribution::GetSpecificDistribution( 599 BrowserDistribution::GetSpecificDistribution(
600 BrowserDistribution::CHROME_BINARIES); 600 BrowserDistribution::CHROME_BINARIES);
601 BrowserDistribution* chrome = 601 BrowserDistribution* chrome =
602 BrowserDistribution::GetSpecificDistribution( 602 BrowserDistribution::GetSpecificDistribution(
603 BrowserDistribution::CHROME_BROWSER); 603 BrowserDistribution::CHROME_BROWSER);
604 604
(...skipping 826 matching lines...) Expand 10 before | Expand all | Expand 10 after
1431 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL, 1431 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
1432 StatsState::FALSE_SETTING, StatsState::FALSE_SETTING), 1432 StatsState::FALSE_SETTING, StatsState::FALSE_SETTING),
1433 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL, 1433 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
1434 StatsState::FALSE_SETTING, StatsState::TRUE_SETTING), 1434 StatsState::FALSE_SETTING, StatsState::TRUE_SETTING),
1435 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL, 1435 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
1436 StatsState::TRUE_SETTING, StatsState::NO_SETTING), 1436 StatsState::TRUE_SETTING, StatsState::NO_SETTING),
1437 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL, 1437 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
1438 StatsState::TRUE_SETTING, StatsState::FALSE_SETTING), 1438 StatsState::TRUE_SETTING, StatsState::FALSE_SETTING),
1439 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL, 1439 StatsState(StatsState::kSystemLevel, StatsState::MULTI_INSTALL,
1440 StatsState::TRUE_SETTING, StatsState::TRUE_SETTING))); 1440 StatsState::TRUE_SETTING, StatsState::TRUE_SETTING)));
OLDNEW
« no previous file with comments | « chrome/installer/util/google_update_settings.cc ('k') | chrome/installer/util/install_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698