Merge 99883 - Completely disable about:flags

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
===================================================================
--- chrome/browser/about_flags.cc	(revision 99885)
+++ chrome/browser/about_flags.cc	(working copy)
@@ -655,7 +655,10 @@
     }
   }
 
+// TODO(thakis): Reenable.
+#if 0
   command_line->AppendSwitch(switches::kFlagSwitchesBegin);
+#endif
   flags_switches_.insert(
       std::pair<std::string, std::string>(switches::kFlagSwitchesBegin,
                                           std::string()));
@@ -673,11 +676,17 @@
     const std::pair<std::string, std::string>&
         switch_and_value_pair = name_to_switch_it->second;
 
+// TODO(thakis): Reenable.
+#if 0
     command_line->AppendSwitchASCII(switch_and_value_pair.first,
                                     switch_and_value_pair.second);
+#endif
     flags_switches_[switch_and_value_pair.first] = switch_and_value_pair.second;
   }
+// TODO(thakis): Reenable.
+#if 0
   command_line->AppendSwitch(switches::kFlagSwitchesEnd);
+#endif
   flags_switches_.insert(
       std::pair<std::string, std::string>(switches::kFlagSwitchesEnd,
                                           std::string()));