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

content/browser/gpu/gpu_util_unittest.cc

 // 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 "content/browser/gpu/gpu_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gl/gl_switches.h"
 
 using content::GpuFeatureType;
 
 TEST(GpuUtilsTest, GpuFeatureTypFromString) {
   // Test StringToGpuFeatureType.
   EXPECT_EQ(gpu_util::StringToGpuFeatureType("accelerated_2d_canvas"),
             content::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS);
   EXPECT_EQ(gpu_util::StringToGpuFeatureType("accelerated_compositing"),
             content::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING);
   EXPECT_EQ(gpu_util::StringToGpuFeatureType("webgl"),
@@ skipping 64 matching lines @@
   EXPECT_STREQ(
       gpu_util::GpuFeatureTypeToString(
           static_cast<content::GpuFeatureType>(
               content::GPU_FEATURE_TYPE_WEBGL |
               content::GPU_FEATURE_TYPE_ALL)).c_str(),
       "all");
 }
 
 TEST(GpuUtilsTest, GpuSwitchingOptionFromString) {
   // Test StringToGpuSwitchingOption.
-  EXPECT_EQ(gpu_util::StringToGpuSwitchingOption(
-                switches::kGpuSwitchingOptionNameAutomatic),
-            content::GPU_SWITCHING_OPTION_AUTOMATIC);
-  EXPECT_EQ(gpu_util::StringToGpuSwitchingOption(
-                switches::kGpuSwitchingOptionNameForceDiscrete),
-            content::GPU_SWITCHING_OPTION_FORCE_DISCRETE);
-  EXPECT_EQ(gpu_util::StringToGpuSwitchingOption(
-                switches::kGpuSwitchingOptionNameForceIntegrated),
-            content::GPU_SWITCHING_OPTION_FORCE_INTEGRATED);
+  EXPECT_EQ(gpu_util::StringToGpuSwitchingOption("automatic"),
+            content::GPU_SWITCHING_AUTOMATIC);
+  EXPECT_EQ(gpu_util::StringToGpuSwitchingOption("force_discrete"),
+            content::GPU_SWITCHING_FORCE_DISCRETE);
+  EXPECT_EQ(gpu_util::StringToGpuSwitchingOption("force_integrated"),
+            content::GPU_SWITCHING_FORCE_INTEGRATED);
   EXPECT_EQ(gpu_util::StringToGpuSwitchingOption("xxx"),
-            content::GPU_SWITCHING_OPTION_UNKNOWN);
+            content::GPU_SWITCHING_UNKNOWN);
 }
 
-TEST(GpuUtilsTest, GpuSwitchingOptionToString) {
-  // Test GpuSwitchingOptionToString.
-  EXPECT_STREQ(
-      gpu_util::GpuSwitchingOptionToString(
-          content::GPU_SWITCHING_OPTION_AUTOMATIC).c_str(),
-      switches::kGpuSwitchingOptionNameAutomatic);
-  EXPECT_STREQ(
-      gpu_util::GpuSwitchingOptionToString(
-          content::GPU_SWITCHING_OPTION_FORCE_DISCRETE).c_str(),
-      switches::kGpuSwitchingOptionNameForceDiscrete);
-  EXPECT_STREQ(
-      gpu_util::GpuSwitchingOptionToString(
-          content::GPU_SWITCHING_OPTION_FORCE_INTEGRATED).c_str(),
-      switches::kGpuSwitchingOptionNameForceIntegrated);
-}
-