Merge 99883 - Completely disable about:flags

chrome/browser/about_flags.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 637 matching lines @@
                                               e.command_line_value);
     } else {
       for (int j = 0; j < e.num_choices; ++j)
         name_to_switch_map[NameForChoice(e, j)] =
             std::pair<std::string, std::string>(
                 e.choices[j].command_line_switch,
                 e.choices[j].command_line_value);
     }
   }
 
+// TODO(thakis): Reenable.
+#if 0
   command_line->AppendSwitch(switches::kFlagSwitchesBegin);
+#endif
   flags_switches_.insert(
       std::pair<std::string, std::string>(switches::kFlagSwitchesBegin,
                                           std::string()));
   for (std::set<std::string>::iterator it = enabled_experiments.begin();
        it != enabled_experiments.end();
        ++it) {
     const std::string& experiment_name = *it;
     NameToSwitchAndValueMap::const_iterator name_to_switch_it =
         name_to_switch_map.find(experiment_name);
     if (name_to_switch_it == name_to_switch_map.end()) {
       NOTREACHED();
       continue;
     }
 
     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()));
 }
 
 bool FlagsState::IsRestartNeededToCommitChanges() {
   return needs_restart_;
 }
 
 void FlagsState::SetExperimentEnabled(
@@ skipping 104 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags