summaryrefslogtreecommitdiffstats
path: root/chrome/browser/about_flags_unittest.cc
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 23:49:14 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 23:49:14 +0000
commit1af1dfeff5d142a28b69906ac544be6675e6bf7a (patch)
tree6632302596e91b37cf740f52eefed41d9e2233de /chrome/browser/about_flags_unittest.cc
parent8bbc466e17e93268b724bae1732e33a0b34c28c8 (diff)
downloadchromium_src-1af1dfeff5d142a28b69906ac544be6675e6bf7a.zip
chromium_src-1af1dfeff5d142a28b69906ac544be6675e6bf7a.tar.gz
chromium_src-1af1dfeff5d142a28b69906ac544be6675e6bf7a.tar.bz2
Enable about:flags in ChromeOS, part 1
BUG=57634 TEST=Go to about:flags in ChromeOS. It should appear. Review URL: http://codereview.chromium.org/3896001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63137 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/about_flags_unittest.cc')
-rw-r--r--chrome/browser/about_flags_unittest.cc15
1 files changed, 0 insertions, 15 deletions
diff --git a/chrome/browser/about_flags_unittest.cc b/chrome/browser/about_flags_unittest.cc
index a18f10f..4372f48 100644
--- a/chrome/browser/about_flags_unittest.cc
+++ b/chrome/browser/about_flags_unittest.cc
@@ -29,18 +29,12 @@ class AboutFlagsTest : public ::testing::Test {
};
TEST_F(AboutFlagsTest, ChangeNeedsRestart) {
- if (!IsEnabled())
- return;
-
EXPECT_FALSE(IsRestartNeededToCommitChanges());
SetExperimentEnabled(&prefs_, kFlags1, true);
EXPECT_TRUE(IsRestartNeededToCommitChanges());
}
TEST_F(AboutFlagsTest, AddTwoFlagsRemoveOne) {
- if (!IsEnabled())
- return;
-
// Add two experiments, check they're there.
SetExperimentEnabled(&prefs_, kFlags1, true);
SetExperimentEnabled(&prefs_, kFlags2, true);
@@ -70,9 +64,6 @@ TEST_F(AboutFlagsTest, AddTwoFlagsRemoveOne) {
}
TEST_F(AboutFlagsTest, AddTwoFlagsRemoveBoth) {
- if (!IsEnabled())
- return;
-
// Add two experiments, check the pref exists.
SetExperimentEnabled(&prefs_, kFlags1, true);
SetExperimentEnabled(&prefs_, kFlags2, true);
@@ -88,9 +79,6 @@ TEST_F(AboutFlagsTest, AddTwoFlagsRemoveBoth) {
}
TEST_F(AboutFlagsTest, ConvertFlagsToSwitches) {
- if (!IsEnabled())
- return;
-
SetExperimentEnabled(&prefs_, kFlags1, true);
CommandLine command_line(CommandLine::ARGUMENTS_ONLY);
@@ -106,9 +94,6 @@ TEST_F(AboutFlagsTest, ConvertFlagsToSwitches) {
}
TEST_F(AboutFlagsTest, RemoveFlagSwitches) {
- if (!IsEnabled())
- return;
-
std::map<std::string, CommandLine::StringType> switch_list;
switch_list[kFlag1CommandLine] = CommandLine::StringType();
switch_list[switches::kFlagSwitchesBegin] = CommandLine::StringType();