XP bot fix.

chrome/test/gpu/gpu_feature_browsertest.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/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/test/trace_event_analyzer.h"
 #include "base/version.h"
@@ skipping 264 matching lines @@
 
 class Canvas2DEnabledTest : public GpuFeatureTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) {
     GpuFeatureTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnableAccelerated2dCanvas);
   }
 };
 
 IN_PROC_BROWSER_TEST_F(Canvas2DEnabledTest, Canvas2DAllowed) {
-  GpuFeatureType type = GpuDataManager::GetInstance()->GetGpuFeatureType();
-  EXPECT_EQ(type, 0);
-
-  const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html"));
-
-  GpuResultFlags expectations = EXPECT_GPU_SWAP_BUFFERS;
 #if defined(OS_WIN)
   // Accelerated canvas 2D is not supported on XP.
   GPUTestBotConfig test_bot;
   test_bot.LoadCurrentConfig(NULL);
   if (test_bot.os() == GPUTestConfig::kOsWinXP)
-    expectations = EXPECT_NO_GPU_PROCESS;
+    return;
 #endif
-  RunTest(url, expectations);
+
+  GpuFeatureType type = GpuDataManager::GetInstance()->GetGpuFeatureType();
+  EXPECT_EQ(type, 0);
+
+  const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html"));
+  RunTest(url, EXPECT_GPU_SWAP_BUFFERS);
 }
 
 IN_PROC_BROWSER_TEST_F(Canvas2DEnabledTest, Canvas2DBlocked) {
   const std::string json_blacklist =
       "{\n"
       "  \"name\": \"gpu blacklist\",\n"
       "  \"version\": \"1.0\",\n"
       "  \"entries\": [\n"
       "    {\n"
       "      \"id\": 1,\n"
@@ skipping 43 matching lines @@
   }
 };
 
 IN_PROC_BROWSER_TEST_F(ThreadedCompositorTest, DISABLED_ThreadedCompositor) {
   const FilePath url(FILE_PATH_LITERAL("feature_compositing.html"));
   RunTest(url, EXPECT_GPU_SWAP_BUFFERS);
 }
 
 }  // namespace anonymous