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

Unified Diff: chrome/browser/about_flags_unittest.cc

Issue 13467023: Add differentiation between owner only and common flags on ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/about_flags_unittest.cc
diff --git a/chrome/browser/about_flags_unittest.cc b/chrome/browser/about_flags_unittest.cc
index 4720ce6619bcdeee0c3080255f5b5818cdd3d366..eb09689857cffa4f12675b4a5eb5857a87ea2bda 100644
--- a/chrome/browser/about_flags_unittest.cc
+++ b/chrome/browser/about_flags_unittest.cc
@@ -118,10 +118,10 @@ class AboutFlagsTest : public ::testing::Test {
virtual void SetUp() OVERRIDE {
for (size_t i = 0; i < arraysize(kExperiments); ++i)
- kExperiments[i].supported_platforms = GetCurrentPlatform();
+ kExperiments[i].supported_platforms = GetCurrentPlatform(true);
int os_other_than_current = 1;
- while (os_other_than_current == GetCurrentPlatform())
+ while (os_other_than_current == GetCurrentPlatform(true))
os_other_than_current <<= 1;
kExperiments[2].supported_platforms = os_other_than_current;
@@ -267,7 +267,7 @@ TEST_F(AboutFlagsTest, PersistAndPrune) {
EXPECT_FALSE(command_line.HasSwitch(kSwitch3));
// Experiment 3 should show still be persisted in preferences though.
- scoped_ptr<ListValue> switch_prefs(GetFlagsExperimentsData(&prefs_));
+ scoped_ptr<ListValue> switch_prefs(GetFlagsExperimentsData(&prefs_, true));
ASSERT_TRUE(switch_prefs.get());
EXPECT_EQ(arraysize(kExperiments), switch_prefs->GetSize());
}
@@ -317,7 +317,7 @@ TEST_F(AboutFlagsTest, CheckValues) {
#endif
// And it should persist
- scoped_ptr<ListValue> switch_prefs(GetFlagsExperimentsData(&prefs_));
+ scoped_ptr<ListValue> switch_prefs(GetFlagsExperimentsData(&prefs_, true));
ASSERT_TRUE(switch_prefs.get());
EXPECT_EQ(arraysize(kExperiments), switch_prefs->GetSize());
}

Powered by Google App Engine
This is Rietveld 408576698