Merge 99883 - Completely disable about:flags

chrome/browser/about_flags_unittest.cc

Index: chrome/browser/about_flags_unittest.cc
===================================================================
--- chrome/browser/about_flags_unittest.cc	(revision 99885)
+++ chrome/browser/about_flags_unittest.cc	(working copy)
@@ -183,7 +183,8 @@
   ConvertFlagsToSwitches(&prefs_, &command_line);
 
   EXPECT_TRUE(command_line.HasSwitch("foo"));
-  EXPECT_TRUE(command_line.HasSwitch(kSwitch1));
+  // TODO(thakis): Undo
+  EXPECT_FALSE(command_line.HasSwitch(kSwitch1));
 }
 
 TEST_F(AboutFlagsTest, RemoveFlagSwitches) {
@@ -228,7 +229,8 @@
   // Convert the flags to switches. Experiment 3 shouldn't be among the switches
   // as it is not applicable to the current platform.
   ConvertFlagsToSwitches(&prefs_, &command_line);
-  EXPECT_TRUE(command_line.HasSwitch(kSwitch1));
+  // TODO(thakis): undo.
+  EXPECT_FALSE(command_line.HasSwitch(kSwitch1));
   EXPECT_FALSE(command_line.HasSwitch(kSwitch3));
 
   // Experiment 3 should show still be persisted in preferences though.
@@ -244,15 +246,18 @@
   SetExperimentEnabled(&prefs_, kFlags1, true);
   SetExperimentEnabled(&prefs_, kFlags2, true);
   CommandLine command_line(CommandLine::NO_PROGRAM);
+  // TODO(thakis): undo.
   EXPECT_FALSE(command_line.HasSwitch(kSwitch1));
   EXPECT_FALSE(command_line.HasSwitch(kSwitch2));
 
   // Convert the flags to switches.
   ConvertFlagsToSwitches(&prefs_, &command_line);
-  EXPECT_TRUE(command_line.HasSwitch(kSwitch1));
+  EXPECT_FALSE(command_line.HasSwitch(kSwitch1));
   EXPECT_EQ(std::string(""), command_line.GetSwitchValueASCII(kSwitch1));
-  EXPECT_TRUE(command_line.HasSwitch(kSwitch2));
-  EXPECT_EQ(std::string(kValueForSwitch2),
+  // TODO(thakis): undo.
+  EXPECT_FALSE(command_line.HasSwitch(kSwitch2));
+  // TODO(thakis): undo.
+  EXPECT_EQ("",
             command_line.GetSwitchValueASCII(kSwitch2));
 
   // Confirm that there is no '=' in the command line for simple switches.
@@ -273,11 +278,13 @@
                                     std::string(kSwitch2) +
                                     std::string("=");
 #if defined(OS_WIN)            
-  EXPECT_NE(std::wstring::npos,
+  // TODO(thakis): undo.
+  EXPECT_EQ(std::wstring::npos,
             command_line.GetCommandLineString().find(
                 ASCIIToWide(switch2_with_equals)));
 #else
-  EXPECT_NE(std::string::npos,
+  // TODO(thakis): undo.
+  EXPECT_EQ(std::string::npos,
             command_line.GetCommandLineString().find(switch2_with_equals));
 #endif
 
@@ -306,8 +313,10 @@
     CommandLine command_line(CommandLine::NO_PROGRAM);
     ConvertFlagsToSwitches(&prefs_, &command_line);
     EXPECT_FALSE(command_line.HasSwitch(kMultiSwitch1));
-    EXPECT_TRUE(command_line.HasSwitch(kMultiSwitch2));
-    EXPECT_EQ(std::string(kValueForMultiSwitch2),
+    // TODO(thakis): undo.
+    EXPECT_FALSE(command_line.HasSwitch(kMultiSwitch2));
+    // TODO(thakis): undo.
+    EXPECT_EQ("",
               command_line.GetSwitchValueASCII(kMultiSwitch2));
   }