Fix GPUTestConfigTest.LoadCurrentConfig on Android

content/test/gpu/gpu_test_config.cc

 // 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.
 
 #include "content/test/gpu/gpu_test_config.h"
 
 #include "base/logging.h"
 #include "base/sys_info.h"
 #include "content/gpu/gpu_info_collector.h"
 #include "content/public/common/gpu_info.h"
@@ skipping 27 matching lines @@
   if (major_version == 10) {
     switch (minor_version) {
       case 5:
         return GPUTestConfig::kOsMacLeopard;
       case 6:
         return GPUTestConfig::kOsMacSnowLeopard;
       case 7:
         return GPUTestConfig::kOsMacLion;
     }
   }
+#elif defined(OS_ANDROID)
+  return GPUTestConfig::kOsAndroid;
 #endif
   return GPUTestConfig::kOsUnknown;
 }
 
 }  // namespace anonymous
 
 GPUTestConfig::GPUTestConfig()
     : os_(kOsUnknown),
       gpu_device_id_(0),
       build_type_(kBuildTypeUnknown) {
 }
 
 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;
 }
 
 void GPUTestConfig::AddGPUVendor(uint32 gpu_vendor) {
   DCHECK_NE(0u, gpu_vendor);
   for (size_t i = 0; i < gpu_vendor_.size(); ++i)
     DCHECK_NE(gpu_vendor_[i], gpu_vendor);
   gpu_vendor_.push_back(gpu_vendor);
 }
 
@@ skipping 65 matching lines @@
 bool GPUTestBotConfig::IsValid() const {
   switch (os()) {
     case kOsWinXP:
     case kOsWinVista:
     case kOsWin7:
     case kOsMacLeopard:
     case kOsMacSnowLeopard:
     case kOsMacLion:
     case kOsLinux:
     case kOsChromeOS:
+    case kOsAndroid:
       break;
     default:
       return false;
   }
   if (gpu_vendor().size() != 1 || gpu_vendor()[0] == 0)
     return false;
   if (gpu_device_id() == 0)
     return false;
   switch (build_type()) {
     case kBuildTypeRelease:
@@ skipping 73 matching lines @@
   GPUTestBotConfig my_config;
   if (!my_config.LoadCurrentConfig(NULL))
     return false;
   for (size_t i = 0 ; i < configs.size(); ++i) {
     if (my_config.Matches(configs[i]))
       return true;
   }
   return false;
 }