Add differentiation between owner only and common flags on ChromeOS.

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>
 
 #include "base/command_line.h"
 #include "base/string16.h"
 
 class PrefService;
 
 namespace base {
 class ListValue;
 }
 
 namespace about_flags {
 
 // Enumeration of OSs.
 // This is exposed only for testing.
 enum { kOsMac = 1 << 0, kOsWin = 1 << 1, kOsLinux = 1 << 2 , kOsCrOS = 1 << 3,
-       kOsAndroid = 1 << 4 };
+       kOsAndroid = 1 << 4, kOsCrOSOwnerOnly = 1 << 5 };
 
 // Experiment is used internally by about_flags to describe an experiment (and
 // for testing).
 // This is exposed only for testing.
 struct Experiment {
   enum Type {
     // An experiment with a single value. This is typically what you want.
     SINGLE_VALUE,
 
     // The experiment has multiple values only one of which is ever enabled.
@@ skipping 65 matching lines @@
 
   // Returns the human readable description for the choice at |index|.
   string16 DescriptionForChoice(int index) const;
 };
 
 // Reads the Labs |prefs| (called "Labs" for historical reasons) and adds the
 // commandline flags belonging to the active experiments to |command_line|.
 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line);
 
 // Get a list of all available experiments. The caller owns the result.
-base::ListValue* GetFlagsExperimentsData(PrefService* prefs);
+base::ListValue* GetFlagsExperimentsData(PrefService* prefs, bool owner);
 
 // Returns true if one of the experiment flags has been flipped since startup.
 bool IsRestartNeededToCommitChanges();
 
 // Enables or disables the experiment with id |internal_name|.
 void SetExperimentEnabled(
     PrefService* prefs, const std::string& internal_name, bool enable);
 
 // Removes all switches that were added to a command line by a previous call to
 // |ConvertFlagsToSwitches()|.
 void RemoveFlagsSwitches(
     std::map<std::string, CommandLine::StringType>* switch_list);
 
 // Reset all flags to the default state by clearing all flags.
 void ResetAllFlags(PrefService* prefs);
 
 // Returns the value for the current platform. This is one of the values defined
 // by the OS enum above.

[Nico, 2013/04/08 19:24:10]

This comment is now no longer true.

[pastarmovj, 2013/04/09 09:17:49]

It still is. I never added a new call to this directly. The new parameter added
is forwarded through the call site - GetFlagsExperimentsData.

I could make the function decide for itself but I decided that it will be
cleaner to forward this value - both for easier mocking and for the fact that we
can't actually decide the ownership synchronously (see flags_ui.cc for details
about that).

[Nico, 2013/04/09 15:38:26]

Right, but if the parameter is true this returns "kOsCrOS | kOsCrOSOwnerOnly",
which is not "one of the values defined by the OS enum above" but a bit-or of
two of those. Which means all call sites now need to do bit tests instead of
equality testing.

 // This is exposed only for testing.
-int GetCurrentPlatform();
+int GetCurrentPlatform(bool owner);
 
 // Sends UMA stats about experimental flag usage. This should be called once per
 // startup.
 void RecordUMAStatistics(const PrefService* prefs);
 
 namespace testing {
 
 // Clears internal global state, for unit tests.
 void ClearState();
 
 // Sets the list of experiments. Pass in NULL to use the default set. This does
 // NOT take ownership of the supplied Experiments.
 void SetExperiments(const Experiment* e, size_t count);
 
 // Returns the current set of experiments.
 const Experiment* GetExperiments(size_t* count);
 
 // 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_