Revert 109328 - Add tests to make sure gpu blacklist actually block gpu features.

chrome/test/gpu/gpu_feature_browsertest.cc

Index: chrome/test/gpu/gpu_feature_browsertest.cc
===================================================================
--- chrome/test/gpu/gpu_feature_browsertest.cc	(revision 109333)
+++ chrome/test/gpu/gpu_feature_browsertest.cc	(working copy)
@@ -1,171 +0,0 @@
-// Copyright (c) 2011 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/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"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/common/chrome_paths.h"
-#include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/test/base/tracing.h"
-#include "chrome/test/base/ui_test_utils.h"
-#include "content/browser/gpu/gpu_blacklist.h"
-#include "content/browser/gpu/gpu_data_manager.h"
-#include "net/base/net_util.h"
-
-namespace {
-
-class GpuFeatureTest : public InProcessBrowserTest {
- public:
-  GpuFeatureTest() {}
-
-  virtual void SetUpCommandLine(CommandLine* command_line) {
-    // This enables DOM automation for tab contents.
-    EnableDOMAutomation();
-  }
-
-  void SetupBlacklist(const std::string& json_blacklist) {
-    scoped_ptr<Version> os_version(Version::GetVersionFromString("1.0"));
-    GpuBlacklist* blacklist = new GpuBlacklist("1.0 unknown");
-
-    ASSERT_TRUE(blacklist->LoadGpuBlacklist(
-        json_blacklist, GpuBlacklist::kAllOs));
-    GpuDataManager::GetInstance()->SetBuiltInGpuBlacklist(blacklist);
-  }
-
-  void RunTest(const std::string& url, bool expect_gpu_process) {
-    using namespace trace_analyzer;
-
-    FilePath test_path;
-    PathService::Get(chrome::DIR_TEST_DATA, &test_path);
-    test_path = test_path.Append(FILE_PATH_LITERAL("gpu"));
-    test_path = test_path.Append(FILE_PATH_LITERAL(url));
-
-    ASSERT_TRUE(file_util::PathExists(test_path))
-        << "Missing test file: " << test_path.value();
-
-    ASSERT_TRUE(tracing::BeginTracing("test_gpu"));
-
-    ui_test_utils::DOMMessageQueue message_queue;
-    // Have to use a new tab for the blacklist to work.
-    ui_test_utils::NavigateToURLWithDisposition(
-        browser(), net::FilePathToFileURL(test_path), NEW_FOREGROUND_TAB,
-        ui_test_utils::BROWSER_TEST_NONE);
-    // Wait for message indicating the test has finished running.
-    ASSERT_TRUE(message_queue.WaitForMessage(NULL));
-
-    std::string json_events;
-    ASSERT_TRUE(tracing::EndTracing(&json_events));
-
-    scoped_ptr<TraceAnalyzer> analyzer(TraceAnalyzer::Create(json_events));
-    EXPECT_EQ(expect_gpu_process, analyzer->FindOneEvent(
-        Query(EVENT_NAME) == Query::String("GpuProcessLaunched")) != NULL);
-  }
-};
-
-IN_PROC_BROWSER_TEST_F(GpuFeatureTest, AcceleratedCompositingAllowed) {
-  GpuFeatureFlags flags = GpuDataManager::GetInstance()->GetGpuFeatureFlags();
-  EXPECT_EQ(flags.flags(), 0u);
-
-  const bool expect_gpu_process = true;
-  RunTest("feature_compositing.html", expect_gpu_process);
-}
-
-IN_PROC_BROWSER_TEST_F(GpuFeatureTest, AcceleratedCompositingBlocked) {
-  const std::string json_blacklist =
-      "{\n"
-      "  \"name\": \"gpu blacklist\",\n"
-      "  \"version\": \"1.0\",\n"
-      "  \"entries\": [\n"
-      "    {\n"
-      "      \"id\": 1,\n"
-      "      \"blacklist\": [\n"
-      "        \"accelerated_compositing\"\n"
-      "      ]\n"
-      "    }\n"
-      "  ]\n"
-      "}";
-  SetupBlacklist(json_blacklist);
-  GpuFeatureFlags flags = GpuDataManager::GetInstance()->GetGpuFeatureFlags();
-  EXPECT_EQ(
-      flags.flags(),
-      static_cast<uint32>(GpuFeatureFlags::kGpuFeatureAcceleratedCompositing));
-
-  const bool expect_gpu_process = false;
-  RunTest("feature_compositing.html", expect_gpu_process);
-}
-
-IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLAllowed) {
-  GpuFeatureFlags flags = GpuDataManager::GetInstance()->GetGpuFeatureFlags();
-  EXPECT_EQ(flags.flags(), 0u);
-
-  const bool expect_gpu_process = true;
-  RunTest("feature_webgl.html", expect_gpu_process);
-}
-
-IN_PROC_BROWSER_TEST_F(GpuFeatureTest, WebGLBlocked) {
-  const std::string json_blacklist =
-      "{\n"
-      "  \"name\": \"gpu blacklist\",\n"
-      "  \"version\": \"1.0\",\n"
-      "  \"entries\": [\n"
-      "    {\n"
-      "      \"id\": 1,\n"
-      "      \"blacklist\": [\n"
-      "        \"webgl\"\n"
-      "      ]\n"
-      "    }\n"
-      "  ]\n"
-      "}";
-  SetupBlacklist(json_blacklist);
-  GpuFeatureFlags flags = GpuDataManager::GetInstance()->GetGpuFeatureFlags();
-  EXPECT_EQ(
-      flags.flags(),
-      static_cast<uint32>(GpuFeatureFlags::kGpuFeatureWebgl));
-
-  const bool expect_gpu_process = false;
-  RunTest("feature_webgl.html", expect_gpu_process);
-}
-
-IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DAllowed) {
-  GpuFeatureFlags flags = GpuDataManager::GetInstance()->GetGpuFeatureFlags();
-  EXPECT_EQ(flags.flags(), 0u);
-
-#if defined(OS_MACOSX)
-  // TODO(zmo): enabling Mac when skia backend is enabled.
-  const bool expect_gpu_process = false;
-#else
-  const bool expect_gpu_process = true;
-#endif
-  RunTest("feature_canvas2d.html", expect_gpu_process);
-}
-
-IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DBlocked) {
-  const std::string json_blacklist =
-      "{\n"
-      "  \"name\": \"gpu blacklist\",\n"
-      "  \"version\": \"1.0\",\n"
-      "  \"entries\": [\n"
-      "    {\n"
-      "      \"id\": 1,\n"
-      "      \"blacklist\": [\n"
-      "        \"accelerated_2d_canvas\"\n"
-      "      ]\n"
-      "    }\n"
-      "  ]\n"
-      "}";
-  SetupBlacklist(json_blacklist);
-  GpuFeatureFlags flags = GpuDataManager::GetInstance()->GetGpuFeatureFlags();
-  EXPECT_EQ(
-      flags.flags(),
-      static_cast<uint32>(GpuFeatureFlags::kGpuFeatureAccelerated2dCanvas));
-
-  const bool expect_gpu_process = false;
-  RunTest("feature_canvas2d.html", expect_gpu_process);
-}
-
-}  // namespace anonymous
-