summaryrefslogtreecommitdiffstats
path: root/chrome/browser/about_flags_unittest.cc
diff options
context:
space:
mode:
authoravayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-16 21:31:00 +0000
committeravayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-16 21:31:00 +0000
commitba8164244f0e273737f620a3364177990bbf8658 (patch)
tree3e426424d14b3b8b4dc3408b37c17f6221459d52 /chrome/browser/about_flags_unittest.cc
parent293fd7a9eb27dac7599a752e847c5b15f449519f (diff)
downloadchromium_src-ba8164244f0e273737f620a3364177990bbf8658.zip
chromium_src-ba8164244f0e273737f620a3364177990bbf8658.tar.gz
chromium_src-ba8164244f0e273737f620a3364177990bbf8658.tar.bz2
Removed Labs section from Chrome OS settings page.
BUG=chromium-os:9035 TEST=Go to chrome://settings and observe that there's no Labs section. Review URL: http://codereview.chromium.org/5025001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66324 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/about_flags_unittest.cc')
-rw-r--r--chrome/browser/about_flags_unittest.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/about_flags_unittest.cc b/chrome/browser/about_flags_unittest.cc
index 6d86cc9..f6b5193 100644
--- a/chrome/browser/about_flags_unittest.cc
+++ b/chrome/browser/about_flags_unittest.cc
@@ -52,6 +52,11 @@ class AboutFlagsTest : public ::testing::Test {
protected:
AboutFlagsTest() {
prefs_.RegisterListPref(prefs::kEnabledLabsExperiments);
+#if defined(OS_CHROMEOS)
+ prefs_.RegisterBooleanPref(prefs::kLabsMediaplayerEnabled, false);
+ prefs_.RegisterBooleanPref(prefs::kLabsAdvancedFilesystemEnabled, false);
+ prefs_.RegisterBooleanPref(prefs::kUseVerticalTabs, false);
+#endif
testing::ClearState();
}