Revert 158076 - Implement blacklist's force GPU capability in dual GPU machines.

content/browser/gpu/gpu_blacklist_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 <vector>
 
 #include "base/base_paths.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 1014 matching lines @@
       "  ]\n"
       "}";
   Version os_version("10.6.4");
 
   scoped_ptr<GpuBlacklist> blacklist(Create());
   EXPECT_TRUE(blacklist->LoadGpuBlacklist(
       gpu_switching_json, GpuBlacklist::kAllOs));
   GpuSwitchingOption switching = blacklist->MakeBlacklistDecision(
       GpuBlacklist::kOsMacosx, &os_version,
       gpu_info()).gpu_switching;
-  EXPECT_EQ(switching, content::GPU_SWITCHING_OPTION_FORCE_DISCRETE);
+  EXPECT_EQ(switching, content::GPU_SWITCHING_FORCE_DISCRETE);
   std::vector<uint32> entries;
   bool disabled = false;
   blacklist->GetDecisionEntries(entries, disabled);
   EXPECT_EQ(entries.size(), 1u);
   EXPECT_EQ(entries[0], 1u);
 
   blacklist.reset(Create());
   EXPECT_TRUE(blacklist->LoadGpuBlacklist(
       gpu_switching_json, GpuBlacklist::kAllOs));
   switching = blacklist->MakeBlacklistDecision(
       GpuBlacklist::kOsWin, &os_version,
       gpu_info()).gpu_switching;
-  EXPECT_EQ(switching, content::GPU_SWITCHING_OPTION_FORCE_INTEGRATED);
+  EXPECT_EQ(switching, content::GPU_SWITCHING_FORCE_INTEGRATED);
   blacklist->GetDecisionEntries(entries, disabled);
   EXPECT_EQ(entries.size(), 1u);
   EXPECT_EQ(entries[0], 2u);
 
   blacklist.reset(Create());
   EXPECT_TRUE(blacklist->LoadGpuBlacklist(
       gpu_switching_json, GpuBlacklist::kAllOs));
   switching = blacklist->MakeBlacklistDecision(
       GpuBlacklist::kOsLinux, &os_version,
       gpu_info()).gpu_switching;
-  EXPECT_EQ(switching, content::GPU_SWITCHING_OPTION_AUTOMATIC);
+  EXPECT_EQ(switching, content::GPU_SWITCHING_AUTOMATIC);
   blacklist->GetDecisionEntries(entries, disabled);
   EXPECT_EQ(entries.size(), 1u);
   EXPECT_EQ(entries[0], 3u);
 }
 
 TEST_F(GpuBlacklistTest, VideoDecode) {
   const std::string video_decode_json =
       "{\n"
       "  \"name\": \"gpu blacklist\",\n"
       "  \"version\": \"0.1\",\n"
@@ skipping 14 matching lines @@
   Version os_version("10.6.4");
 
   scoped_ptr<GpuBlacklist> blacklist(Create());
   EXPECT_TRUE(blacklist->LoadGpuBlacklist(
       video_decode_json, GpuBlacklist::kAllOs));
   GpuFeatureType type = blacklist->MakeBlacklistDecision(
       GpuBlacklist::kOsMacosx, &os_version,
       gpu_info()).blacklisted_features;
   EXPECT_EQ(type, content::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE);
 }