7 files changed, 29 insertions, 22 deletions
diff --git a/webkit/glue/media/mock_media_resource_loader_bridge_factory.h b/webkit/glue/media/mock_media_resource_loader_bridge_factory.h
index 7bb27fe..3c0a3ae 100644
--- a/webkit/glue/media/mock_media_resource_loader_bridge_factory.h
+++ b/webkit/glue/media/mock_media_resource_loader_bridge_factory.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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_MOCK_RESOURCE_LOADER_BRIDGE_H_
-#define WEBKIT_GLUE_MOCK_RESOURCE_LOADER_BRIDGE_H_
+#ifndef WEBKIT_GLUE_MEDIA_MOCK_MEDIA_RESOURCE_LOADER_BRIDGE_FACTORY_H_
+#define WEBKIT_GLUE_MEDIA_MOCK_MEDIA_RESOURCE_LOADER_BRIDGE_FACTORY_H_
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "webkit/glue/media/media_resource_loader_bridge_factory.h"
@@ -33,4 +33,4 @@ class MockMediaResourceLoaderBridgeFactory
 
 }  // namespace webkit_glue
 
-#endif  // WEBKIT_GLUE_MEDIA_MOCK_RESOURCE_LOADER_BRIDGE_H_
+#endif  // WEBKIT_GLUE_MEDIA_MOCK_MEDIA_RESOURCE_LOADER_BRIDGE_FACTORY_H_
diff --git a/webkit/glue/mock_resource_loader_bridge.h b/webkit/glue/mock_resource_loader_bridge.h
index 0dd1c36..2f60393 100644
--- a/webkit/glue/mock_resource_loader_bridge.h
+++ b/webkit/glue/mock_resource_loader_bridge.h
@@ -1,14 +1,15 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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_MEDIA_MOCK_MEDIA_RESOURCE_LOADER_BRIDGE_FACTORY_H_
-#define WEBKIT_GLUE_MEDIA_MOCK_MEDIA_RESOURCE_LOADER_BRIDGE_FACTORY_H_
+#ifndef WEBKIT_GLUE_MOCK_RESOURCE_LOADER_BRIDGE_H_
+#define WEBKIT_GLUE_MOCK_RESOURCE_LOADER_BRIDGE_H_
 
-#include "base/file_path.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "webkit/glue/resource_loader_bridge.h"
 
+class FilePath;
+
 namespace webkit_glue {
 
 class MockResourceLoaderBridge : public webkit_glue::ResourceLoaderBridge {
@@ -39,4 +40,4 @@ class MockResourceLoaderBridge : public webkit_glue::ResourceLoaderBridge {
 
 }  // namespace webkit_glue
 
-#endif  // WEBKIT_GLUE_MEDIA_MOCK_MEDIA_RESOURCE_LOADER_BRIDGE_FACTORY_H_
+#endif  // WEBKIT_GLUE_MOCK_RESOURCE_LOADER_BRIDGE_H_
diff --git a/webkit/glue/plugins/pepper_plugin_module.h b/webkit/glue/plugins/pepper_plugin_module.h
index 6bfeccf..f624110 100644
--- a/webkit/glue/plugins/pepper_plugin_module.h
+++ b/webkit/glue/plugins/pepper_plugin_module.h
@@ -8,12 +8,13 @@
 #include <set>
 
 #include "base/basictypes.h"
-#include "base/file_path.h"
 #include "base/native_library.h"
 #include "base/ref_counted.h"
 #include "third_party/ppapi/c/pp_module.h"
 #include "third_party/ppapi/c/ppb.h"
 
+class FilePath;
+
 typedef struct _ppb_Core PPB_Core;
 
 namespace pepper {
diff --git a/webkit/glue/plugins/pepper_webplugin_impl.cc b/webkit/glue/plugins/pepper_webplugin_impl.cc
index df8aae0..68fdb88 100644
--- a/webkit/glue/plugins/pepper_webplugin_impl.cc
+++ b/webkit/glue/plugins/pepper_webplugin_impl.cc
@@ -4,7 +4,6 @@
 
 #include "webkit/glue/plugins/pepper_webplugin_impl.h"
 
-#include "base/file_path.h"
 #include "base/message_loop.h"
 #include "third_party/ppapi/c/pp_var.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPluginParams.h"
diff --git a/webkit/glue/plugins/plugin_lib.h b/webkit/glue/plugins/plugin_lib.h
index 647916e..ca46e41 100644
--- a/webkit/glue/plugins/plugin_lib.h
+++ b/webkit/glue/plugins/plugin_lib.h
@@ -9,13 +9,13 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/file_path.h"
 #include "base/native_library.h"
 #include "base/ref_counted.h"
 #include "build/build_config.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/plugins/webplugin.h"
 
+class FilePath;
 struct WebPluginInfo;
 
 namespace NPAPI {
diff --git a/webkit/glue/plugins/plugin_stream.h b/webkit/glue/plugins/plugin_stream.h
index f15ea66..c17faaf 100644
--- a/webkit/glue/plugins/plugin_stream.h
+++ b/webkit/glue/plugins/plugin_stream.h
@@ -2,13 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_PLUGIN_PLUGIN_STREAM_H__
-#define WEBKIT_GLUE_PLUGIN_PLUGIN_STREAM_H__
+#ifndef WEBKIT_GLUE_PLUGINS_PLUGIN_STREAM_H_
+#define WEBKIT_GLUE_PLUGINS_PLUGIN_STREAM_H_
+
+#include "build/build_config.h"
 
 #include <string>
 #include <vector>
 
+#if defined(OS_POSIX)
 #include "base/file_path.h"
+#endif
 #include "base/ref_counted.h"
 #include "third_party/npapi/bindings/npapi.h"
 
@@ -110,7 +114,8 @@ class PluginStream : public base::RefCounted<PluginStream> {
 
   // Send the data to the plugin, returning how many bytes it accepted, or -1
   // if an error occurred.
-  int TryWriteToPlugin(const char *buf, const int length, const int data_offset);
+  int TryWriteToPlugin(const char *buf, const int length,
+                       const int data_offset);
 
   // The callback which calls TryWriteToPlugin.
   void OnDelayDelivery();
@@ -141,6 +146,6 @@ class PluginStream : public base::RefCounted<PluginStream> {
   DISALLOW_COPY_AND_ASSIGN(PluginStream);
 };
 
-} // namespace NPAPI
+}  // namespace NPAPI
 
-#endif // WEBKIT_GLUE_PLUGIN_PLUGIN_STREAM_H__
+#endif  // WEBKIT_GLUE_PLUGINS_PLUGIN_STREAM_H_
diff --git a/webkit/glue/plugins/webplugin_delegate_impl.h b/webkit/glue/plugins/webplugin_delegate_impl.h
index 1c7ccb2..5fe4547 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl.h
+++ b/webkit/glue/plugins/webplugin_delegate_impl.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_PLUGIN_WEBPLUGIN_DELEGATE_IMPL_H_
-#define WEBKIT_GLUE_PLUGIN_WEBPLUGIN_DELEGATE_IMPL_H_
+#ifndef WEBKIT_GLUE_PLUGINS_WEBPLUGIN_DELEGATE_IMPL_H_
+#define WEBKIT_GLUE_PLUGINS_WEBPLUGIN_DELEGATE_IMPL_H_
 
 #include "build/build_config.h"
 
@@ -11,7 +11,6 @@
 #include <list>
 #include <set>
 
-#include "base/file_path.h"
 #include "base/ref_counted.h"
 #include "base/task.h"
 #include "base/time.h"
@@ -32,6 +31,8 @@
 typedef struct _GdkDrawable GdkPixmap;
 #endif
 
+class FilePath;
+
 namespace NPAPI {
 class PluginInstance;
 }
@@ -297,7 +298,7 @@ class WebPluginDelegateImpl : public webkit_glue::WebPluginDelegate {
   // layout of this process with the one of the browser process.
   HKL keyboard_layout_;
   int parent_thread_id_;
-#endif // OS_WIN
+#endif  // defined(OS_WIN)
 
 #if defined(USE_X11)
   // The SHM pixmap for a windowless plugin.
@@ -498,4 +499,4 @@ class WebPluginDelegateImpl : public webkit_glue::WebPluginDelegate {
   DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateImpl);
 };
 
-#endif  // WEBKIT_GLUE_PLUGIN_WEBPLUGIN_DELEGATE_IMPL_H_
+#endif  // WEBKIT_GLUE_PLUGINS_WEBPLUGIN_DELEGATE_IMPL_H_