Owner flags storage should not save the flags names but the actual switches.

chrome/browser/about_flags.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_ABOUT_FLAGS_H_
 #define CHROME_BROWSER_ABOUT_FLAGS_H_
 
 #include <map>
 #include <string>
 
@@ skipping 87 matching lines @@
   // This is used if type is MULTI_VALUE.
   int num_choices;
 
   // Returns the name used in prefs for the choice at the specified |index|.
   std::string NameForChoice(int index) const;
 
   // Returns the human readable description for the choice at |index|.
   string16 DescriptionForChoice(int index) const;
 };
 
+// A flag controlling the behavior of the |ConvertFlagsToSwitches| function -
+// whether it should add the sentinel switches around flags.
+enum SentinelsMode { kNoSentinels, kAddSentinels };
+
 // Reads the Labs |prefs| (called "Labs" for historical reasons) and adds the
 // commandline flags belonging to the active experiments to |command_line|.
 void ConvertFlagsToSwitches(FlagsStorage* flags_storage,
-                            CommandLine* command_line);
+                            CommandLine* command_line,
+                            SentinelsMode sentinels);
 
 // Compares a set of switches of the two provided command line objects and
 // returns true if they are the same and false otherwise.
 bool AreSwitchesIdenticalToCurrentCommandLine(
     const CommandLine& new_cmdline, const CommandLine& active_cmdline);
 
 // Differentiate between generic flags available on a per session base and flags
 // that influence the whole machine and can be said by the admin only. This flag
 // is relevant for ChromeOS for now only and dictates whether entries marked
 // with the |kOsCrOSOwnerOnly| label should be enabled in the UI or not.
@@ skipping 46 matching lines @@
 
 // Separator used for multi values. Multi values are represented in prefs as
 // name-of-experiment + kMultiSeparator + selected_index.
 extern const char kMultiSeparator[];
 
 }  // namespace testing
 
 }  // namespace about_flags
 
 #endif  // CHROME_BROWSER_ABOUT_FLAGS_H_