Remove dead code for gpu blacklist auto-update.

BUG=103851
TEST=tree
R=kbr
Review URL: http://codereview.chromium.org/8758003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112879 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 45 deletions

diff --git a/content/browser/gpu/gpu_data_manager.cc b/content/browser/gpu/gpu_data_manager.cc
index 6be0ca8..17895b3 100644
--- a/content/browser/gpu/gpu_data_manager.cc
+++ b/content/browser/gpu/gpu_data_manager.cc
@@ -485,47 +485,12 @@ void GpuDataManager::AppendGpuCommandLine(
   }
 }
 
-void GpuDataManager::SetBuiltInGpuBlacklist(GpuBlacklist* built_in_list) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(built_in_list);
-  uint16 version_major, version_minor;
-  bool succeed = built_in_list->GetVersion(
-      &version_major, &version_minor);
-  DCHECK(succeed);
-  gpu_blacklist_.reset(built_in_list);
-  UpdateGpuFeatureFlags();
-  preliminary_gpu_feature_flags_ = gpu_feature_flags_;
-  VLOG(1) << "Using software rendering list version "
-          << version_major << "." << version_minor;
-}
-
-void GpuDataManager::UpdateGpuBlacklist(
-    GpuBlacklist* gpu_blacklist, bool preliminary) {
+void GpuDataManager::SetGpuBlacklist(GpuBlacklist* gpu_blacklist) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(gpu_blacklist);
-
-  scoped_ptr<GpuBlacklist> updated_list(gpu_blacklist);
-
-  uint16 updated_version_major, updated_version_minor;
-  if (!updated_list->GetVersion(
-          &updated_version_major, &updated_version_minor))
-    return;
-
-  uint16 current_version_major, current_version_minor;
-  bool succeed = gpu_blacklist_->GetVersion(
-      &current_version_major, &current_version_minor);
-  DCHECK(succeed);
-  if (updated_version_major < current_version_major ||
-      (updated_version_major == current_version_major &&
-       updated_version_minor <= current_version_minor))
-    return;
-
-  gpu_blacklist_.reset(updated_list.release());
+  gpu_blacklist_.reset(gpu_blacklist);
   UpdateGpuFeatureFlags();
-  if (preliminary)
-    preliminary_gpu_feature_flags_ = gpu_feature_flags_;
-  VLOG(1) << "Using software rendering list version "
-          << updated_version_major << "." << updated_version_minor;
+  preliminary_gpu_feature_flags_ = gpu_feature_flags_;
 }
 
 void GpuDataManager::HandleGpuSwitch() {
diff --git a/content/browser/gpu/gpu_data_manager.h b/content/browser/gpu/gpu_data_manager.h
index e2585af..5880c2f 100644
--- a/content/browser/gpu/gpu_data_manager.h
+++ b/content/browser/gpu/gpu_data_manager.h
@@ -114,13 +114,7 @@ class CONTENT_EXPORT GpuDataManager {
 
   // Gives ownership of the built-in blacklist.  This is always called on the
   // UI thread.
-  void SetBuiltInGpuBlacklist(GpuBlacklist* built_in_list);
-
-  // Gives ownership of the latest blacklist.  This is always called on the UI
-  // thread.
-  // TODO(zmo): Get rid of preliminary because it should not be exposed to
-  // outside GpuDataManager.
-  void UpdateGpuBlacklist(GpuBlacklist* updated_list, bool preliminary);
+  void SetGpuBlacklist(GpuBlacklist* gpu_blacklist);
 
   // This gets called when switching GPU might have happened.
   void HandleGpuSwitch();