Fix a bunch of include problems that my deps checker tool found. Mostly I made the names of some third party includes fully qualified. I removed a qualification on a couple of the WebKit port includes that confuses it and isn't necessary (since WebKit includes aren't fully qualified).

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

23 files changed, 31 insertions, 31 deletions

diff --git a/chrome/common/plugin_messages.h b/chrome/common/plugin_messages.h
index 65dfbba..c74cc90 100644
--- a/chrome/common/plugin_messages.h
+++ b/chrome/common/plugin_messages.h
@@ -40,10 +40,10 @@
 
 #include "base/gfx/rect.h"
 #include "base/basictypes.h"
-#include "bindings/npapi.h"
 #include "chrome/common/ipc_message.h"
 #include "chrome/common/ipc_message_utils.h"
 #include "googleurl/src/gurl.h"
+#include "third_party/npapi/bindings/npapi.h"
 #include "webkit/glue/npruntime_util.h"
 
 void PluginMessagesInit();
diff --git a/chrome/installer/util/lzma_util.cc b/chrome/installer/util/lzma_util.cc
index 45c30c4..f664d97 100644
--- a/chrome/installer/util/lzma_util.cc
+++ b/chrome/installer/util/lzma_util.cc
@@ -27,16 +27,16 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "lzma_util.h"
+#include "chrome/installer/util/lzma_util.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 
 extern "C" {
-#include "Archive/7z/7zExtract.h"
-#include "Archive/7z/7zIn.h"
-#include "7zCrc.h"
+#include "third_party/lzma_sdk/Archive/7z/7zExtract.h"
+#include "third_party/lzma_sdk/Archive/7z/7zIn.h"
+#include "third_party/lzma_sdk/7zCrc.h"
 }
 
 
diff --git a/chrome/plugin/npobject_proxy.h b/chrome/plugin/npobject_proxy.h
index b75aa1c..8630825 100644
--- a/chrome/plugin/npobject_proxy.h
+++ b/chrome/plugin/npobject_proxy.h
@@ -34,8 +34,8 @@
 #define CHROME_PLUGIN_NPOBJECT_PROXY_H__
 
 #include "base/ref_counted.h"
-#include "bindings/npruntime.h"
 #include "chrome/common/ipc_channel.h"
+#include "third_party/npapi/bindings/npruntime.h"
 
 class PluginChannelBase;
 struct NPObject;
diff --git a/chrome/plugin/npobject_stub.cc b/chrome/plugin/npobject_stub.cc
index 3ec6ca5..8851984a2 100644
--- a/chrome/plugin/npobject_stub.cc
+++ b/chrome/plugin/npobject_stub.cc
@@ -29,12 +29,12 @@
 
 #include "chrome/plugin/npobject_stub.h"
 
-#include "bindings/npapi.h"
-#include "bindings/npruntime.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/plugin/plugin_channel_base.h"
 #include "chrome/renderer/webplugin_delegate_proxy.h"
+#include "third_party/npapi/bindings/npapi.h"
+#include "third_party/npapi/bindings/npruntime.h"
 
 NPObjectStub::NPObjectStub(
     NPObject* npobject, PluginChannelBase* channel, int route_id)
diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc
index 0678b14..8004cdf 100644
--- a/chrome/plugin/webplugin_delegate_stub.cc
+++ b/chrome/plugin/webplugin_delegate_stub.cc
@@ -33,8 +33,6 @@
 #include "base/time.h"
 #include "base/gfx/bitmap_header.h"
 #include "base/gfx/platform_device.h"
-#include "bindings/npapi.h"
-#include "bindings/npruntime.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/gfx/emf.h"
 #include "chrome/common/plugin_messages.h"
@@ -43,6 +41,8 @@
 #include "chrome/plugin/plugin_channel.h"
 #include "chrome/plugin/plugin_thread.h"
 #include "chrome/plugin/webplugin_proxy.h"
+#include "third_party/npapi/bindings/npapi.h"
+#include "third_party/npapi/bindings/npruntime.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/webcursor.h"
 
diff --git a/chrome/plugin/webplugin_delegate_stub.h b/chrome/plugin/webplugin_delegate_stub.h
index 27ecac6..b1814b3 100644
--- a/chrome/plugin/webplugin_delegate_stub.h
+++ b/chrome/plugin/webplugin_delegate_stub.h
@@ -35,9 +35,9 @@
 #include "base/gfx/rect.h"
 #include "base/ref_counted.h"
 #include "base/task.h"
-#include "bindings/npapi.h"
 #include "chrome/common/ipc_channel.h"
 #include "chrome/common/plugin_messages.h"
+#include "third_party/npapi/bindings/npapi.h"
 
 class GURL;
 class PluginChannel;
diff --git a/webkit/default_plugin/plugin_database_handler.h b/webkit/default_plugin/plugin_database_handler.h
index a4813f5..9e78fcf 100644
--- a/webkit/default_plugin/plugin_database_handler.h
+++ b/webkit/default_plugin/plugin_database_handler.h
@@ -35,7 +35,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "bindings/npapi.h"
+#include "third_party/npapi/bindings/npapi.h"
 
 // Individual plugin details
 struct PluginDetail {
diff --git a/webkit/default_plugin/plugin_impl.h b/webkit/default_plugin/plugin_impl.h
index a1245c6..4c88762 100644
--- a/webkit/default_plugin/plugin_impl.h
+++ b/webkit/default_plugin/plugin_impl.h
@@ -36,7 +36,7 @@
 #include <vector>
 
 #include "base/logging.h"
-#include "bindings/npapi.h"
+#include "third_party/npapi/bindings/npapi.h"
 #include "webkit/default_plugin/install_dialog.h"
 #include "webkit/default_plugin/plugin_database_handler.h"
 #include "webkit/default_plugin/plugin_install_job_monitor.h"
diff --git a/webkit/default_plugin/plugin_main.h b/webkit/default_plugin/plugin_main.h
index b4e3568..03e7066 100644
--- a/webkit/default_plugin/plugin_main.h
+++ b/webkit/default_plugin/plugin_main.h
@@ -30,7 +30,7 @@
 #include <algorithm>
 #include <string>
 
-#include "bindings/npapi.h"
+#include "third_party/npapi/bindings/npapi.h"
 #include "webkit/glue/plugins/nphostapi.h"
 
 namespace default_plugin {
diff --git a/webkit/glue/cpp_variant.h b/webkit/glue/cpp_variant.h
index 5e57a51..e8843af 100644
--- a/webkit/glue/cpp_variant.h
+++ b/webkit/glue/cpp_variant.h
@@ -47,7 +47,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "bindings/npruntime.h"
+#include "third_party/npapi/bindings/npruntime.h"
 
 class CppVariant : public NPVariant {
  public:
diff --git a/webkit/glue/npruntime_util.cc b/webkit/glue/npruntime_util.cc
index 5c0ec96..327ee0c 100644
--- a/webkit/glue/npruntime_util.cc
+++ b/webkit/glue/npruntime_util.cc
@@ -35,7 +35,7 @@
 #if USE(V8_BINDING)
 #include "webkit/port/bindings/v8/np_v8object.h"
 #elif USE(JAVASCRIPTCORE_BINDINGS)
-#include "bindings/c/c_utility.h"
+#include "third_party/npapi/bindings/c/c_utility.h"
 using KJS::Bindings::PrivateIdentifier;
 #endif
 
diff --git a/webkit/glue/plugins/nphostapi.h b/webkit/glue/plugins/nphostapi.h
index a248fd6..f3b83eb 100644
--- a/webkit/glue/plugins/nphostapi.h
+++ b/webkit/glue/plugins/nphostapi.h
@@ -32,8 +32,8 @@
 #ifndef WEBKIT_GLUE_PLUGIN_NPHOSTAPI_H__
 #define WEBKIT_GLUE_PLUGIN_NPHOSTAPI_H__
 
-#include "bindings/npapi.h"
-#include "bindings/npruntime.h"
+#include "third_party/npapi/bindings/npapi.h"
+#include "third_party/npapi/bindings/npruntime.h"
 
 #ifdef __cplusplus
 extern "C" { 
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index cdfe972..64b79de 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -93,7 +93,6 @@
 #include "FrameTree.h"
 #include "FrameView.h"
 #include "FrameWin.h"
-#include "graphics/SkiaUtils.h"
 #include "GraphicsContext.h"
 #include "HTMLHeadElement.h"
 #include "HTMLLinkElement.h"
@@ -110,10 +109,11 @@
 #include "ResourceRequest.h"
 #include "SelectionController.h"
 #include "Settings.h"
+#include "SkiaUtils.h"
 #include "SubstituteData.h"
 #include "TextIterator.h"
 #include "TextAffinity.h"
-#include "xml/XPathResult.h"
+#include "XPathResult.h"
 
 #pragma warning(pop)
 
diff --git a/webkit/glue/webplugin_delegate.h b/webkit/glue/webplugin_delegate.h
index 43ab88c..996fa8e 100644
--- a/webkit/glue/webplugin_delegate.h
+++ b/webkit/glue/webplugin_delegate.h
@@ -34,7 +34,7 @@
 
 #include "base/basictypes.h"
 #include "base/gfx/rect.h"
-#include "bindings/npapi.h"
+#include "third_party/npapi/bindings/npapi.h"
 
 typedef struct HDC__* HDC;
 
diff --git a/webkit/glue/webwidget_impl.cc b/webkit/glue/webwidget_impl.cc
index 010d9f0..70dc0a1 100644
--- a/webkit/glue/webwidget_impl.cc
+++ b/webkit/glue/webwidget_impl.cc
@@ -37,6 +37,7 @@
 #include "PlatformKeyboardEvent.h"
 #include "PlatformMouseEvent.h"
 #include "PlatformWheelEvent.h"
+#include "SkiaUtils.h"
 #pragma warning(pop)
 
 #undef LOG
@@ -47,7 +48,6 @@
 #include "webkit/glue/webinputevent.h"
 #include "webkit/glue/webwidget_delegate.h"
 #include "webkit/glue/webwidget_impl.h"
-#include "graphics/SkiaUtils.h"
 
 using namespace WebCore;
 
diff --git a/webkit/port/bindings/v8/np_v8object.h b/webkit/port/bindings/v8/np_v8object.h
index cc25057..b03522e 100644
--- a/webkit/port/bindings/v8/np_v8object.h
+++ b/webkit/port/bindings/v8/np_v8object.h
@@ -30,7 +30,7 @@
 #ifndef NP_V8OBJECT_H__
 #define NP_V8OBJECT_H__
 
-#include "bindings/npruntime.h"
+#include "third_party/npapi/bindings/npruntime.h"
 #include <v8.h>
 
 namespace WebCore {
diff --git a/webkit/port/bindings/v8/npruntime_impl.h b/webkit/port/bindings/v8/npruntime_impl.h
index 7dae168..58ec490 100644
--- a/webkit/port/bindings/v8/npruntime_impl.h
+++ b/webkit/port/bindings/v8/npruntime_impl.h
@@ -26,7 +26,7 @@
 #ifndef _NP_RUNTIME_IMPL_H_
 #define _NP_RUNTIME_IMPL_H_
 
-#include "bindings/npruntime.h"
+#include "third_party/npapi/bindings/npruntime.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/webkit/port/bindings/v8/npruntime_priv.h b/webkit/port/bindings/v8/npruntime_priv.h
index 543c7d1..88a3ac3 100644
--- a/webkit/port/bindings/v8/npruntime_priv.h
+++ b/webkit/port/bindings/v8/npruntime_priv.h
@@ -27,7 +27,7 @@
 #define NP_RUNTIME_PRIV_H_
 
 
-#include "bindings/npruntime.h"
+#include "third_party/npapi/bindings/npruntime.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/webkit/port/bindings/v8/v8_helpers.h b/webkit/port/bindings/v8/v8_helpers.h
index 39b53f3..3160721 100644
--- a/webkit/port/bindings/v8/v8_helpers.h
+++ b/webkit/port/bindings/v8/v8_helpers.h
@@ -30,7 +30,7 @@
 #ifndef V8_HELPERS_H__
 #define V8_HELPERS_H__
 
-#include "bindings/npruntime.h"
+#include "third_party/npapi/bindings/npruntime.h"
 #include <v8.h>
 
 namespace WebCore {
diff --git a/webkit/port/bindings/v8/v8_np_utils.h b/webkit/port/bindings/v8/v8_np_utils.h
index 5124571..b547877 100644
--- a/webkit/port/bindings/v8/v8_np_utils.h
+++ b/webkit/port/bindings/v8/v8_np_utils.h
@@ -31,7 +31,7 @@
 #define V8_NP_UTILS_H__
 
 #include <v8.h>
-#include "bindings/npruntime.h"
+#include "third_party/npapi/bindings/npruntime.h"
 
 namespace WebCore {
   class Frame;
diff --git a/webkit/port/bindings/v8/v8_npobject.h b/webkit/port/bindings/v8/v8_npobject.h
index 3ff7d31..ff17a17 100644
--- a/webkit/port/bindings/v8/v8_npobject.h
+++ b/webkit/port/bindings/v8/v8_npobject.h
@@ -31,7 +31,7 @@
 #define V8_NPOBJECT_H__
 
 #include <v8.h>
-#include "bindings/npruntime.h"
+#include "third_party/npapi/bindings/npruntime.h"
 
 // These functions can be replaced by normal JS operation.
 // Getters
diff --git a/webkit/port/bridge/JSBridge.h b/webkit/port/bridge/JSBridge.h
index 154a2d6..d6e6090 100644
--- a/webkit/port/bridge/JSBridge.h
+++ b/webkit/port/bridge/JSBridge.h
@@ -33,7 +33,7 @@
 #ifndef JSBridge_h
 #define JSBridge_h
 
-#include "bindings/npruntime.h"
+#include "third_party/npapi/bindings/npruntime.h"
 #if USE(JAVASCRIPTCORE_BINDINGS)
 #include <kjs/ustring.h>
 #endif
diff --git a/webkit/tools/npapi_layout_test_plugin/TestObject.h b/webkit/tools/npapi_layout_test_plugin/TestObject.h
index fe9839f..6b177b2 100644
--- a/webkit/tools/npapi_layout_test_plugin/TestObject.h
+++ b/webkit/tools/npapi_layout_test_plugin/TestObject.h
@@ -31,8 +31,8 @@
  OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "bindings/npapi.h"
-#include "bindings/npruntime.h"
+#include "third_party/npapi/bindings/npapi.h"
+#include "third_party/npapi/bindings/npruntime.h"
 
 
 typedef struct {