7 files changed, 17 insertions, 18 deletions
diff --git a/webkit/glue/plugins/mac_gpu_plugin_container.cc b/chrome/browser/renderer_host/gpu_plugin_container_mac.cc
index d9ddd47..a2b69f4 100644
--- a/webkit/glue/plugins/mac_gpu_plugin_container.cc
+++ b/chrome/browser/renderer_host/gpu_plugin_container_mac.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/glue/plugins/mac_gpu_plugin_container.h"
+#include "chrome/browser/renderer_host/gpu_plugin_container_mac.h"
 
 #include "base/logging.h"
-#include "webkit/glue/webplugin.h"
-#include "webkit/glue/plugins/mac_gpu_plugin_container_manager.h"
+#include "chrome/browser/renderer_host/gpu_plugin_container_manager_mac.h"
 #include "chrome/common/io_surface_support_mac.h"
+#include "webkit/glue/webplugin.h"
 
 MacGPUPluginContainer::MacGPUPluginContainer()
     : x_(0),
diff --git a/webkit/glue/plugins/mac_gpu_plugin_container.h b/chrome/browser/renderer_host/gpu_plugin_container_mac.h
index 4055a4b..b985147 100644
--- a/webkit/glue/plugins/mac_gpu_plugin_container.h
+++ b/chrome/browser/renderer_host/gpu_plugin_container_mac.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_PLUGINS_MAC_GPU_PLUGIN_CONTAINER_H_
-#define WEBKIT_GLUE_PLUGINS_MAC_GPU_PLUGIN_CONTAINER_H_
+#ifndef CHROME_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MAC_H_
+#define CHROME_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MAC_H_
 
 // The "GPU plugin" is currently implemented as a special kind of
 // NPAPI plugin to provide high-performance on-screen 3D rendering for
@@ -110,5 +110,5 @@ class MacGPUPluginContainer {
   DISALLOW_COPY_AND_ASSIGN(MacGPUPluginContainer);
 };
 
-#endif  // WEBKIT_GLUE_PLUGINS_MAC_GPU_PLUGIN_CONTAINER_H_
+#endif  // CHROME_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MAC_H_
 
diff --git a/webkit/glue/plugins/mac_gpu_plugin_container_manager.cc b/chrome/browser/renderer_host/gpu_plugin_container_manager_mac.cc
index fe7e649..8eae393 100644
--- a/webkit/glue/plugins/mac_gpu_plugin_container_manager.cc
+++ b/chrome/browser/renderer_host/gpu_plugin_container_manager_mac.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/glue/plugins/mac_gpu_plugin_container_manager.h"
+#include "chrome/browser/renderer_host/gpu_plugin_container_manager_mac.h"
 
 #include "base/logging.h"
+#include "chrome/browser/renderer_host/gpu_plugin_container_mac.h"
 #include "webkit/glue/webplugin.h"
-#include "webkit/glue/plugins/mac_gpu_plugin_container.h"
 
 MacGPUPluginContainerManager::MacGPUPluginContainerManager()
     : current_id_(0) {
diff --git a/webkit/glue/plugins/mac_gpu_plugin_container_manager.h b/chrome/browser/renderer_host/gpu_plugin_container_manager_mac.h
index 9fca919..89e8620 100644
--- a/webkit/glue/plugins/mac_gpu_plugin_container_manager.h
+++ b/chrome/browser/renderer_host/gpu_plugin_container_manager_mac.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_PLUGINS_MAC_GPU_PLUGIN_CONTAINER_MANAGER_H_
-#define WEBKIT_GLUE_PLUGINS_MAC_GPU_PLUGIN_CONTAINER_MANAGER_H_
+#ifndef CHROME_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MANAGER_MAC_H_
+#define CHROME_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MANAGER_MAC_H_
 
 #include <OpenGL/OpenGL.h>
 #include <map>
@@ -74,5 +74,5 @@ class MacGPUPluginContainerManager {
   DISALLOW_COPY_AND_ASSIGN(MacGPUPluginContainerManager);
 };
 
-#endif  // WEBKIT_GLUE_PLUGINS_MAC_GPU_PLUGIN_CONTAINER_MANAGER_H_
+#endif  // CHROME_BROWSER_RENDERER_HOST_GPU_PLUGIN_CONTAINER_MANAGER_MAC_H_
 
diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.h b/chrome/browser/renderer_host/render_widget_host_view_mac.h
index c8e4078..6433653 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.h
@@ -13,10 +13,10 @@
 #include "base/task.h"
 #include "base/time.h"
 #include "chrome/browser/cocoa/base_view.h"
+#include "chrome/browser/renderer_host/gpu_plugin_container_manager_mac.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webmenuitem.h"
-#include "webkit/glue/plugins/mac_gpu_plugin_container_manager.h"
 
 class RenderWidgetHostViewMac;
 class RWHVMEditCommandHelper;
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index af3fcb8..6bb8d74 100755
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1658,6 +1658,10 @@
         'browser/renderer_host/global_request_id.h',
         'browser/renderer_host/gpu_view_host.cc',
         'browser/renderer_host/gpu_view_host.h',
+        'browser/renderer_host/gpu_plugin_container_mac.cc',
+        'browser/renderer_host/gpu_plugin_container_mac.h',
+        'browser/renderer_host/gpu_plugin_container_manager_mac.cc',
+        'browser/renderer_host/gpu_plugin_container_manager_mac.h',
         'browser/renderer_host/gtk_im_context_wrapper.cc',
         'browser/renderer_host/gtk_im_context_wrapper.h',
         'browser/renderer_host/gtk_key_bindings_handler.cc',
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 6422e6a..e1401a9 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -263,10 +263,6 @@
         'glue/plugins/gtk_plugin_container.cc',
         'glue/plugins/gtk_plugin_container_manager.h',
         'glue/plugins/gtk_plugin_container_manager.cc',
-        'glue/plugins/mac_gpu_plugin_container.h',
-        'glue/plugins/mac_gpu_plugin_container.cc',
-        'glue/plugins/mac_gpu_plugin_container_manager.h',
-        'glue/plugins/mac_gpu_plugin_container_manager.cc',
         'glue/plugins/npapi_extension_thunk.cc',
         'glue/plugins/npapi_extension_thunk.h',
         'glue/plugins/plugin_constants_win.h',
@@ -420,8 +416,7 @@
                        ['exclude', r'/gtk_']],
         }],
         ['OS!="mac"', {
-          'sources/': [['exclude', '_mac\\.(cc|mm)$'],
-                       ['exclude', r'/mac_']],
+          'sources/': [['exclude', '_mac\\.(cc|mm)$']],
         }, {  # else: OS=="mac"
           'sources/': [['exclude', 'plugin_(lib|list)_posix\\.cc$']],
           'link_settings': {