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

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

Issue 131763004: Merge 242400 "Remove installation of Chrome Frame." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1750/src/
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/installer/setup/setup_util.cc ('k') | chrome/installer/util/browser_distribution.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/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 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 BrowserDistribution::CHROME_FRAME)); 478 BrowserDistribution::CHROME_FRAME));
479 EXPECT_TRUE(chrome_frame.GetUsageStats(&usagestats)); 479 EXPECT_TRUE(chrome_frame.GetUsageStats(&usagestats));
480 EXPECT_EQ(1U, usagestats); 480 EXPECT_EQ(1U, usagestats);
481 EXPECT_EQ(L"2.0-dev", chrome_frame.channel().value()); 481 EXPECT_EQ(L"2.0-dev", chrome_frame.channel().value());
482 482
483 // Confirm that the binaries' channel no longer contains GCF. 483 // Confirm that the binaries' channel no longer contains GCF.
484 ASSERT_TRUE(binaries.Initialize(kSystemLevel, 484 ASSERT_TRUE(binaries.Initialize(kSystemLevel,
485 BrowserDistribution::CHROME_BINARIES)); 485 BrowserDistribution::CHROME_BINARIES));
486 EXPECT_EQ(L"2.0-dev-multi", binaries.channel().value()); 486 EXPECT_EQ(L"2.0-dev-multi", binaries.channel().value());
487 } 487 }
488
489 TEST(SetupUtilTest, ContainsUnsupportedSwitch) {
490 EXPECT_FALSE(installer::ContainsUnsupportedSwitch(
491 CommandLine::FromString(L"foo.exe")));
492 EXPECT_FALSE(installer::ContainsUnsupportedSwitch(
493 CommandLine::FromString(L"foo.exe --multi-install --chrome")));
494 EXPECT_TRUE(installer::ContainsUnsupportedSwitch(
495 CommandLine::FromString(L"foo.exe --chrome-frame")));
496 }
OLDNEW
« no previous file with comments | « chrome/installer/setup/setup_util.cc ('k') | chrome/installer/util/browser_distribution.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698