Cleanup: Remove old webkit/glue/plugins/plugin_list.h

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7639009

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

3 files changed, 3 insertions, 40 deletions

diff --git a/chrome/browser/chromeos/gview_request_interceptor.cc b/chrome/browser/chromeos/gview_request_interceptor.cc
index fe98c15..bfa5eae 100644
--- a/chrome/browser/chromeos/gview_request_interceptor.cc
+++ b/chrome/browser/chromeos/gview_request_interceptor.cc
@@ -12,7 +12,7 @@
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_redirect_job.h"
-#include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/plugins/npapi/plugin_list.h"
 
 namespace chromeos {
 
diff --git a/chrome/test/ui/npapi_test_helper.cc b/chrome/test/ui/npapi_test_helper.cc
index 87c1ba1..65bf5a7 100644
--- a/chrome/test/ui/npapi_test_helper.cc
+++ b/chrome/test/ui/npapi_test_helper.cc
@@ -1,10 +1,4 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -14,7 +8,7 @@
 #include "base/test/test_file_util.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
-#include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/plugins/npapi/plugin_list.h"
 
 namespace npapi_test {
 const char kTestCompleteCookie[] = "status";
diff --git a/webkit/glue/plugins/plugin_list.h b/webkit/glue/plugins/plugin_list.h
deleted file mode 100644
index 580d8dd..0000000
--- a/webkit/glue/plugins/plugin_list.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) 2010 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.
-
-#ifndef WEBKIT_GLUE_PLUGINS_PLUGIN_LIST_H_
-#define WEBKIT_GLUE_PLUGINS_PLUGIN_LIST_H_
-
-// This file is here to keep NativeClient compiling. PluginList was moved to
-// webkit/plugins/npapi and into the webkit::npapi namespace. Native Client
-// depends on this old location & namespace, so we provide just enough
-// definitions here to keep it compiling until it can be updated to use the
-// new location & namespace.
-//
-// TODO(brettw) remove this flie when NaCl is updated.
-
-#include "webkit/plugins/npapi/plugin_list.h"
-
-namespace NPAPI {
-
-typedef webkit::npapi::PluginEntryPoints PluginEntryPoints;
-
-class PluginList {
- public:
-  static inline webkit::npapi::PluginList* Singleton() {
-    return webkit::npapi::PluginList::Singleton();
-  }
-};
-
-}  // namespace NPAPI
-
-#endif  // WEBKIT_GLUE_PLUGINS_PLUGIN_LIST_H_