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

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

Issue 100543005: Update all users of base::Version to explicitly specify the namespace, and clean up the header. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: someday it will work Created 6 years, 12 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 | Annotate | Revision Log
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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 // and a set of modifiers. 172 // and a set of modifiers.
173 void FakeProductState::SetChannel(const wchar_t* base, int channel_modifiers) { 173 void FakeProductState::SetChannel(const wchar_t* base, int channel_modifiers) {
174 channel_.set_value(base); 174 channel_.set_value(base);
175 for (size_t i = 0; i < arraysize(kChannelMethods); ++i) { 175 for (size_t i = 0; i < arraysize(kChannelMethods); ++i) {
176 if ((channel_modifiers & kChannelMethods[i].modifier) != 0) 176 if ((channel_modifiers & kChannelMethods[i].modifier) != 0)
177 (channel_.*kChannelMethods[i].method)(true); 177 (channel_.*kChannelMethods[i].method)(true);
178 } 178 }
179 } 179 }
180 180
181 void FakeProductState::SetVersion(const char* version) { 181 void FakeProductState::SetVersion(const char* version) {
182 version_.reset(version == NULL ? NULL : new Version(version)); 182 version_.reset(version == NULL ? NULL : new base::Version(version));
183 } 183 }
184 184
185 // Sets the uninstall command for this object. 185 // Sets the uninstall command for this object.
186 void FakeProductState::SetUninstallCommand(BrowserDistribution::Type dist_type, 186 void FakeProductState::SetUninstallCommand(BrowserDistribution::Type dist_type,
187 Level install_level, 187 Level install_level,
188 const char* version, 188 const char* version,
189 int channel_modifiers, 189 int channel_modifiers,
190 Vehicle vehicle) { 190 Vehicle vehicle) {
191 DCHECK(version); 191 DCHECK(version);
192 192
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 AllValidInstallations, 568 AllValidInstallations,
569 InstallationValidatorTest, 569 InstallationValidatorTest,
570 Values(InstallationValidator::NO_PRODUCTS, 570 Values(InstallationValidator::NO_PRODUCTS,
571 InstallationValidator::CHROME_SINGLE, 571 InstallationValidator::CHROME_SINGLE,
572 InstallationValidator::CHROME_MULTI, 572 InstallationValidator::CHROME_MULTI,
573 InstallationValidator::CHROME_FRAME_SINGLE, 573 InstallationValidator::CHROME_FRAME_SINGLE,
574 InstallationValidator::CHROME_FRAME_SINGLE_CHROME_SINGLE, 574 InstallationValidator::CHROME_FRAME_SINGLE_CHROME_SINGLE,
575 InstallationValidator::CHROME_FRAME_SINGLE_CHROME_MULTI, 575 InstallationValidator::CHROME_FRAME_SINGLE_CHROME_MULTI,
576 InstallationValidator::CHROME_FRAME_MULTI, 576 InstallationValidator::CHROME_FRAME_MULTI,
577 InstallationValidator::CHROME_FRAME_MULTI_CHROME_MULTI)); 577 InstallationValidator::CHROME_FRAME_MULTI_CHROME_MULTI));
OLDNEW
« no previous file with comments | « chrome/installer/util/installation_validator.cc ('k') | chrome/installer/util/installer_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698