Revert 155218 - Move gpu blacklist to content side.

content/browser/gpu/gpu_data_manager_impl_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/message_loop.h"
 #include "base/run_loop.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "content/public/common/gpu_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 51 matching lines @@
 TEST_F(GpuDataManagerImplTest, GpuSideBlacklisting) {
   // If a feature is allowed in preliminary step (browser side), but
   // disabled when GPU process launches and collects full GPU info,
   // it's too late to let renderer know, so we basically block all GPU
   // access, to be on the safe side.
   GpuDataManagerImpl* manager = new GpuDataManagerImpl();
   ASSERT_TRUE(manager);
   EXPECT_EQ(0, manager->GetBlacklistedFeatures());
   EXPECT_TRUE(manager->GpuAccessAllowed());
 
-  manager->UpdateBlacklistedFeatures(
+  manager->SetPreliminaryBlacklistedFeatures(
       content::GPU_FEATURE_TYPE_WEBGL);
-  manager->UpdatePreliminaryBlacklistedFeatures();
   EXPECT_TRUE(manager->GpuAccessAllowed());
   EXPECT_EQ(content::GPU_FEATURE_TYPE_WEBGL,
             manager->GetBlacklistedFeatures());
 
   manager->UpdateBlacklistedFeatures(
       content::GPU_FEATURE_TYPE_WEBGL);
   EXPECT_TRUE(manager->GpuAccessAllowed());
   EXPECT_EQ(content::GPU_FEATURE_TYPE_WEBGL,
             manager->GetBlacklistedFeatures());
 
@@ skipping 54 matching lines @@
   content::GPUVideoMemoryUsageStats vram_stats;
   manager->UpdateVideoMemoryUsageStats(vram_stats);
 
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
   EXPECT_TRUE(observer.video_memory_usage_stats_updated());
 
   delete manager;
 }