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

content/browser/gpu/gpu_blacklist.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 "content/browser/gpu/gpu_blacklist.h"
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
@@ skipping 776 matching lines @@
     }
   }
   decision_.blacklisted_features = static_cast<GpuFeatureType>(feature_type);
   return true;
 }
 
 bool GpuBlacklist::GpuBlacklistEntry::SetGpuSwitchingOption(
     const std::string& switching_string) {
   GpuSwitchingOption switching = gpu_util::StringToGpuSwitchingOption(
       switching_string);
-  if (switching == content::GPU_SWITCHING_OPTION_UNKNOWN)
+  if (switching == content::GPU_SWITCHING_UNKNOWN)
     return false;
   decision_.gpu_switching = switching;
   return true;
 }
 
 void GpuBlacklist::GpuBlacklistEntry::AddException(
     ScopedGpuBlacklistEntry exception) {
   exceptions_.push_back(exception);
 }
 
@@ skipping 221 matching lines @@
   contains_unknown_fields_ = contains_unknown_fields;
   return true;
 }
 
 GpuBlacklist::Decision GpuBlacklist::MakeBlacklistDecision(
     GpuBlacklist::OsType os,
     Version* os_version,
     const content::GPUInfo& gpu_info) {
   active_entries_.clear();
   int type = 0;
-  GpuSwitchingOption switching = content::GPU_SWITCHING_OPTION_AUTOMATIC;
+  GpuSwitchingOption switching = content::GPU_SWITCHING_AUTOMATIC;
 
   if (os == kOsAny)
     os = GetOsType();
   scoped_ptr<Version> my_os_version;
   if (os_version == NULL) {
     std::string version_string = base::SysInfo::OperatingSystemVersion();
     size_t pos = version_string.find_first_not_of("0123456789.");
     if (pos != std::string::npos)
       version_string = version_string.substr(0, pos);
     my_os_version.reset(new Version(version_string));
     os_version = my_os_version.get();
   }
   DCHECK(os_version != NULL);
 
   for (size_t i = 0; i < blacklist_.size(); ++i) {
     if (blacklist_[i]->Contains(os, *os_version, gpu_info)) {
       if (!blacklist_[i]->disabled()) {
         type |= blacklist_[i]->GetGpuFeatureType();
         if (blacklist_[i]->GetGpuSwitchingOption() !=
-                content::GPU_SWITCHING_OPTION_AUTOMATIC)
+                content::GPU_SWITCHING_AUTOMATIC)
           switching = blacklist_[i]->GetGpuSwitchingOption();
       }
       active_entries_.push_back(blacklist_[i]);
     }
   }
   Decision decision;
   decision.blacklisted_features = static_cast<GpuFeatureType>(type);
   decision.gpu_switching = switching;
   return decision;
 }
@@ skipping 112 matching lines @@
   if (op == ">")
     return kGT;
   if (op == ">=")
     return kGE;
   if (op == "any")
     return kAny;
   if (op == "between")
     return kBetween;
   return kUnknown;
 }