Fix GPUTestConfigTest.LoadCurrentConfig on Android

It's a case in content unittests. Implement the config for Android.

BUG=
TEST=run_tests.py -s content_unittests


Review URL: https://chromiumcodereview.appspot.com/10815027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148040 0039d316-1c4b-4281-b951-d872f2087c98

build/android/gtest_filter/content_unittests_disabled

@@ -19,7 +19,6 @@ URLFetcherDownloadProgressTest.Basic
 URLFetcherUploadProgressTest.Basic
 URLFetcherStopOnRedirectTest.StopOnRedirect
 BaseFileTest.ReadonlyBaseFile
-GPUTestConfigTest.LoadCurrentConfig
 URLFetcherFileTest.SmallGet
 URLFetcherFileTest.LargeGet
 URLFetcherFileTest.CanTakeOwnershipOfFile

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;

content/test/gpu/gpu_test_config.h

@@ -29,6 +29,7 @@ class GPUTestConfig {
     kOsMac = kOsMacLeopard | kOsMacSnowLeopard | kOsMacLion,
     kOsLinux = 1 << 6,
     kOsChromeOS = 1 << 7,
+    kOsAndroid = 1 << 8,
   };
 
   enum BuildType {