Merge gpu_switching_list into gpu_driver_bug_list.

content/browser/gpu/gpu_data_manager_impl.cc

 // Copyright (c) 2013 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_data_manager_impl.h"
 
 #include "content/browser/gpu/gpu_data_manager_impl_private.h"
 
 namespace content {
 
@@ skipping 144 matching lines @@
   base::AutoLock auto_lock(lock_);
   private_->AppendPluginCommandLine(command_line);
 }
 
 void GpuDataManagerImpl::UpdateRendererWebPrefs(
     WebPreferences* prefs) const {
   base::AutoLock auto_lock(lock_);
   private_->UpdateRendererWebPrefs(prefs);
 }
 
-gpu::GpuSwitchingOption GpuDataManagerImpl::GetGpuSwitchingOption() const {
-  base::AutoLock auto_lock(lock_);
-  return private_->GetGpuSwitchingOption();
-}
-
 std::string GpuDataManagerImpl::GetBlacklistVersion() const {
   base::AutoLock auto_lock(lock_);
   return private_->GetBlacklistVersion();
 }
 
 std::string GpuDataManagerImpl::GetDriverBugListVersion() const {
   base::AutoLock auto_lock(lock_);
   return private_->GetDriverBugListVersion();
 }
 
@@ skipping 88 matching lines @@
 }
 
 GpuDataManagerImpl::GpuDataManagerImpl()
     : private_(GpuDataManagerImplPrivate::Create(this)) {
 }
 
 GpuDataManagerImpl::~GpuDataManagerImpl() {
 }
 
 }  // namespace content