Use PPAPI from chrome trunk rather than pulling via deps. This is a re-land from r64716. This is identical with an an include directory changed in the ppapi repo which I'm hoping was what was confusing everything.

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

13 files changed, 30 insertions, 30 deletions

diff --git a/remoting/DEPS b/remoting/DEPS
index d929d84..fbdd04d 100644
--- a/remoting/DEPS
+++ b/remoting/DEPS
@@ -5,6 +5,7 @@ include_rules = [
   "+media/base",
   "+net",
   "+jingle",
+  "+ppapi",
   "+talk",
   "+third_party/npapi"
   "+third_party/protobuf2",
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index 3a5f2fa..67979c0 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -10,6 +10,9 @@
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/thread.h"
+#include "ppapi/c/pp_input_event.h"
+#include "ppapi/cpp/completion_callback.h"
+#include "ppapi/cpp/rect.h"
 #include "remoting/client/client_config.h"
 #include "remoting/client/client_util.h"
 #include "remoting/client/chromoting_client.h"
@@ -20,9 +23,6 @@
 #include "remoting/client/plugin/pepper_input_handler.h"
 #include "remoting/client/plugin/pepper_view.h"
 #include "remoting/jingle_glue/jingle_thread.h"
-#include "third_party/ppapi/c/pp_input_event.h"
-#include "third_party/ppapi/cpp/completion_callback.h"
-#include "third_party/ppapi/cpp/rect.h"
 
 namespace remoting {
 
diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h
index df1db9f..f706478 100644
--- a/remoting/client/plugin/chromoting_instance.h
+++ b/remoting/client/plugin/chromoting_instance.h
@@ -12,14 +12,14 @@
 
 #include "base/gtest_prod_util.h"
 #include "base/scoped_ptr.h"
+#include "ppapi/c/pp_instance.h"
+#include "ppapi/c/pp_rect.h"
+#include "ppapi/c/pp_resource.h"
+#include "ppapi/cpp/instance.h"
+#include "ppapi/cpp/var.h"
 #include "remoting/client/client_context.h"
 #include "remoting/client/host_connection.h"
 #include "remoting/client/plugin/chromoting_scriptable_object.h"
-#include "third_party/ppapi/c/pp_instance.h"
-#include "third_party/ppapi/c/pp_rect.h"
-#include "third_party/ppapi/c/pp_resource.h"
-#include "third_party/ppapi/cpp/instance.h"
-#include "third_party/ppapi/cpp/var.h"
 
 class MessageLoop;
 struct PP_InputEvent;
diff --git a/remoting/client/plugin/chromoting_scriptable_object.cc b/remoting/client/plugin/chromoting_scriptable_object.cc
index 1fc04e4..4b19c3c 100644
--- a/remoting/client/plugin/chromoting_scriptable_object.cc
+++ b/remoting/client/plugin/chromoting_scriptable_object.cc
@@ -4,11 +4,10 @@
 
 #include "remoting/client/plugin/chromoting_scriptable_object.h"
 
+#include "ppapi/cpp/var.h"
 #include "remoting/client/client_config.h"
 #include "remoting/client/plugin/chromoting_instance.h"
 
-#include "third_party/ppapi/cpp/var.h"
-
 using pp::Var;
 
 namespace remoting {
diff --git a/remoting/client/plugin/chromoting_scriptable_object.h b/remoting/client/plugin/chromoting_scriptable_object.h
index c317f57..6940721 100644
--- a/remoting/client/plugin/chromoting_scriptable_object.h
+++ b/remoting/client/plugin/chromoting_scriptable_object.h
@@ -41,8 +41,8 @@
 #include <string>
 #include <vector>
 
-#include "third_party/ppapi/cpp/dev/scriptable_object_deprecated.h"
-#include "third_party/ppapi/cpp/var.h"
+#include "ppapi/cpp/dev/scriptable_object_deprecated.h"
+#include "ppapi/cpp/var.h"
 
 namespace remoting {
 
diff --git a/remoting/client/plugin/pepper_entrypoints.cc b/remoting/client/plugin/pepper_entrypoints.cc
index 77307b3..a5e6142 100644
--- a/remoting/client/plugin/pepper_entrypoints.cc
+++ b/remoting/client/plugin/pepper_entrypoints.cc
@@ -5,13 +5,13 @@
 #include "remoting/client/plugin/pepper_entrypoints.h"
 
 #include "base/message_loop.h"
+#include "ppapi/c/pp_errors.h"
+#include "ppapi/c/pp_instance.h"
+#include "ppapi/c/pp_module.h"
+#include "ppapi/c/ppb_instance.h"
+#include "ppapi/cpp/instance.h"
+#include "ppapi/cpp/module.h"
 #include "remoting/client/plugin/chromoting_instance.h"
-#include "third_party/ppapi/c/pp_errors.h"
-#include "third_party/ppapi/c/pp_instance.h"
-#include "third_party/ppapi/c/pp_module.h"
-#include "third_party/ppapi/c/ppb_instance.h"
-#include "third_party/ppapi/cpp/instance.h"
-#include "third_party/ppapi/cpp/module.h"
 
 static pp::Module* g_module_singleton = NULL;
 
diff --git a/remoting/client/plugin/pepper_entrypoints.h b/remoting/client/plugin/pepper_entrypoints.h
index ab6de20..a9ec138 100644
--- a/remoting/client/plugin/pepper_entrypoints.h
+++ b/remoting/client/plugin/pepper_entrypoints.h
@@ -5,8 +5,8 @@
 #ifndef REMOTING_CLIENT_PLUGIN_PEPPER_ENTRYPOINTS_
 #define REMOTING_CLIENT_PLUGIN_PEPPER_ENTRYPOINTS_
 
-#include "third_party/ppapi/c/pp_module.h"
-#include "third_party/ppapi/c/ppb.h"
+#include "ppapi/c/pp_module.h"
+#include "ppapi/c/ppb.h"
 
 namespace remoting {
 
diff --git a/remoting/client/plugin/pepper_input_handler.cc b/remoting/client/plugin/pepper_input_handler.cc
index c2e2099..5599655 100644
--- a/remoting/client/plugin/pepper_input_handler.cc
+++ b/remoting/client/plugin/pepper_input_handler.cc
@@ -4,7 +4,7 @@
 
 #include "remoting/client/plugin/pepper_input_handler.h"
 
-#include "third_party/ppapi/c/pp_input_event.h"
+#include "ppapi/c/pp_input_event.h"
 
 namespace remoting {
 
diff --git a/remoting/client/plugin/pepper_util.cc b/remoting/client/plugin/pepper_util.cc
index 7c91233..ff0c0f5 100644
--- a/remoting/client/plugin/pepper_util.cc
+++ b/remoting/client/plugin/pepper_util.cc
@@ -5,8 +5,8 @@
 #include "remoting/client/plugin/pepper_util.h"
 
 #include "base/task.h"
-#include "third_party/ppapi/c/pp_completion_callback.h"
-#include "third_party/ppapi/cpp/module.h"
+#include "ppapi/c/pp_completion_callback.h"
+#include "ppapi/cpp/module.h"
 
 namespace remoting {
 
diff --git a/remoting/client/plugin/pepper_util.h b/remoting/client/plugin/pepper_util.h
index 6c6cfb0..1201689 100644
--- a/remoting/client/plugin/pepper_util.h
+++ b/remoting/client/plugin/pepper_util.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 
-#include "third_party/ppapi/cpp/completion_callback.h"
+#include "ppapi/cpp/completion_callback.h"
 
 class Task;
 
diff --git a/remoting/client/plugin/pepper_view.cc b/remoting/client/plugin/pepper_view.cc
index f941b08..26d128b 100644
--- a/remoting/client/plugin/pepper_view.cc
+++ b/remoting/client/plugin/pepper_view.cc
@@ -5,14 +5,14 @@
 #include "remoting/client/plugin/pepper_view.h"
 
 #include "base/message_loop.h"
+#include "ppapi/cpp/graphics_2d.h"
+#include "ppapi/cpp/image_data.h"
+#include "ppapi/cpp/point.h"
+#include "ppapi/cpp/size.h"
 #include "remoting/base/tracer.h"
 #include "remoting/client/client_context.h"
 #include "remoting/client/plugin/chromoting_instance.h"
 #include "remoting/client/plugin/pepper_util.h"
-#include "third_party/ppapi/cpp/graphics_2d.h"
-#include "third_party/ppapi/cpp/image_data.h"
-#include "third_party/ppapi/cpp/point.h"
-#include "third_party/ppapi/cpp/size.h"
 
 namespace remoting {
 
diff --git a/remoting/client/plugin/pepper_view.h b/remoting/client/plugin/pepper_view.h
index 80ce1ae..1213533 100644
--- a/remoting/client/plugin/pepper_view.h
+++ b/remoting/client/plugin/pepper_view.h
@@ -17,10 +17,10 @@
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "media/base/video_frame.h"
+#include "ppapi/cpp/graphics_2d.h"
 #include "remoting/client/chromoting_view.h"
 #include "remoting/client/frame_consumer.h"
 #include "remoting/client/rectangle_update_decoder.h"
-#include "third_party/ppapi/cpp/graphics_2d.h"
 
 namespace remoting {
 
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 8661eb3..dc72d8b 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -73,7 +73,7 @@
         'chromoting_base',
         'chromoting_client',
         'chromoting_jingle_glue',
-        '../third_party/ppapi/ppapi.gyp:ppapi_cpp_objects',
+        '../ppapi/ppapi.gyp:ppapi_cpp_objects',
       ],
       'sources': [
         'client/plugin/chromoting_instance.cc',