Checkpoint: android fixes towards compilation of unit_tests.

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index d7eb3646337a675ef4c6ea147c6b8fd0ac71dd49..17a2d027223824ca5b23cebf1a83fc65b68a9f4c 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -42,7 +42,7 @@ namespace about_flags {
 
 namespace {
 
-const unsigned kOsAll = kOsMac | kOsWin | kOsLinux | kOsCrOS;
+const unsigned kOsAll = kOsMac | kOsWin | kOsLinux | kOsCrOS | kOsAndroid;
 
 // Adds a |StringValue| to |list| for each platform where |bitmask| indicates
 // whether the experiment is available on that platform.
@@ -776,6 +776,8 @@ int GetCurrentPlatform() {
   return kOsCrOS;
 #elif defined(OS_LINUX) || defined(OS_OPENBSD)
   return kOsLinux;
+#elif defined(OS_ANDROID)
+  return kOsAndroid;
 #else
 #error Unknown platform
 #endif