Fix GPUTestConfigTest.LoadCurrentConfig on Android

content/test/gpu/gpu_test_config.cc

Index: content/test/gpu/gpu_test_config.cc
diff --git a/content/test/gpu/gpu_test_config.cc b/content/test/gpu/gpu_test_config.cc
index b6744ce38a69f4154868248ea0bda06941be65e3..44d085a68f023bd58da991cde6007c142bf3ce6d 100644
--- a/content/test/gpu/gpu_test_config.cc
+++ b/content/test/gpu/gpu_test_config.cc
@@ -45,6 +45,8 @@ GPUTestConfig::OS GetCurrentOS() {
         return GPUTestConfig::kOsMacLion;
     }
   }
+#elif defined(OS_ANDROID)
+  return GPUTestConfig::kOsAndroid;
 #endif
   return GPUTestConfig::kOsUnknown;
 }
@@ -61,7 +63,7 @@ GPUTestConfig::~GPUTestConfig() {
 }
 
 void GPUTestConfig::set_os(int32 os) {
-  DCHECK_EQ(0, os & ~(kOsWin | kOsMac | kOsLinux | kOsChromeOS));
+  DCHECK_EQ(0, os & ~(kOsAndroid | kOsWin | kOsMac | kOsLinux | kOsChromeOS));
   os_ = os;
 }
 
@@ -147,6 +149,7 @@ bool GPUTestBotConfig::IsValid() const {
     case kOsMacLion:
     case kOsLinux:
     case kOsChromeOS:
+    case kOsAndroid:
       break;
     default:
       return false;