Add differentiation between owner only and common flags on ChromeOS.

chrome/browser/about_flags.h

Index: chrome/browser/about_flags.h
diff --git a/chrome/browser/about_flags.h b/chrome/browser/about_flags.h
index 2225d3d4a58faf40462a560c77f691899a09f444..e0df3e6563d8f5fb3f0f9a51215be76942677ce4 100644
--- a/chrome/browser/about_flags.h
+++ b/chrome/browser/about_flags.h
@@ -22,7 +22,7 @@ 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).
@@ -108,7 +108,7 @@ struct Experiment {
 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();
@@ -128,7 +128,7 @@ 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.