Checkpoint: android fixes towards compilation of unit_tests.

chrome/browser/about_flags.h

 // Copyright (c) 2010 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_
 #pragma once
 
 #include <map>
 #include <string>
 
 #include "base/command_line.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 };
+enum { kOsMac = 1 << 0, kOsWin = 1 << 1, kOsLinux = 1 << 2 , kOsCrOS = 1 << 3,
+       kOsAndroid = 1 << 4 };
 
 // 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 91 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_