Add support for android in gpu test expections parser

content/test/gpu/gpu_test_expectations_parser_unittest.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 "base/logging.h"
 #include "content/test/gpu/gpu_test_expectations_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class GPUTestExpectationsParserTest : public testing::Test {
  public:
@@ skipping 71 matching lines @@
 
   GPUTestExpectationsParser parser;
   EXPECT_TRUE(parser.LoadTestExpectations(text));
   EXPECT_EQ(0u, parser.GetErrorMessages().size());
   EXPECT_EQ(GPUTestExpectationsParser::kGpuTestPass,
             parser.GetTestExpectation("MyTest", bot_config()));
 }
 
 TEST_F(GPUTestExpectationsParserTest, AllModifiers) {
   const std::string text =
-      "BUG12345 XP VISTA WIN7 LEOPARD SNOWLEOPARD LION LINUX CHROMEOS "
+      "BUG12345 XP VISTA WIN7 LEOPARD SNOWLEOPARD LION LINUX CHROMEOS ANDROID "
       "NVIDIA INTEL AMD VMWARE RELEASE DEBUG : MyTest = "
       "PASS FAIL FLAKY TIMEOUT SKIP";
 
   GPUTestExpectationsParser parser;
   EXPECT_TRUE(parser.LoadTestExpectations(text));
   EXPECT_EQ(0u, parser.GetErrorMessages().size());
   EXPECT_EQ(GPUTestExpectationsParser::kGpuTestPass |
             GPUTestExpectationsParser::kGpuTestFail |
             GPUTestExpectationsParser::kGpuTestFlaky |
             GPUTestExpectationsParser::kGpuTestTimeout |
             GPUTestExpectationsParser::kGpuTestSkip,
             parser.GetTestExpectation("MyTest", bot_config()));
 }
 
 TEST_F(GPUTestExpectationsParserTest, DuplicateModifiers) {
   const std::string text =
       "BUG12345 WIN7 WIN7 RELEASE NVIDIA 0x0640 : MyTest = FAIL";
 
   GPUTestExpectationsParser parser;
   EXPECT_FALSE(parser.LoadTestExpectations(text));
   EXPECT_NE(0u, parser.GetErrorMessages().size());
 }
 
 TEST_F(GPUTestExpectationsParserTest, AllModifiersLowerCase) {
   const std::string text =
-      "BUG12345 xp vista win7 leopard snowleopard lion linux chromeos "
+      "BUG12345 xp vista win7 leopard snowleopard lion linux chromeos android "
       "nvidia intel amd vmware release debug : MyTest = "
       "pass fail flaky timeout skip";
 
   GPUTestExpectationsParser parser;
   EXPECT_TRUE(parser.LoadTestExpectations(text));
   EXPECT_EQ(0u, parser.GetErrorMessages().size());
   EXPECT_EQ(GPUTestExpectationsParser::kGpuTestPass |
             GPUTestExpectationsParser::kGpuTestFail |
             GPUTestExpectationsParser::kGpuTestFlaky |
             GPUTestExpectationsParser::kGpuTestTimeout |
@@ skipping 111 matching lines @@
 
 TEST_F(GPUTestExpectationsParserTest, WebGLTestExpectationsValidation) {
   GPUTestExpectationsParser parser;
   EXPECT_TRUE(parser.LoadTestExpectations(
       GPUTestExpectationsParser::kWebGLConformanceTest));
   EXPECT_EQ(0u, parser.GetErrorMessages().size());
   for (size_t i = 0; i < parser.GetErrorMessages().size(); ++i)
     LOG(ERROR) << parser.GetErrorMessages()[i];
 }