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

6 files changed, 11 insertions, 11 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;