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@64718 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 5 insertions, 5 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 453138e..f4c9e7e 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1620,6 +1620,7 @@
             '../ipc/ipc.gyp:*',
             '../media/media.gyp:*',
             '../net/net.gyp:*',
+            '../ppapi/ppapi.gyp:*',
             '../printing/printing.gyp:*',
             '../sdch/sdch.gyp:*',
             '../skia/skia.gyp:*',
@@ -1637,7 +1638,6 @@
             '../third_party/lzma_sdk/lzma_sdk.gyp:*',
             '../third_party/modp_b64/modp_b64.gyp:*',
             '../third_party/npapi/npapi.gyp:*',
-            '../third_party/ppapi/ppapi.gyp:*',
             '../third_party/sqlite/sqlite.gyp:*',
             '../third_party/zlib/zlib.gyp:*',
             '../webkit/support/webkit_support.gyp:*',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 0556402..e165f41 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -458,7 +458,7 @@
         # run time dependencies
         'chrome_mesa',
         'default_plugin/default_plugin.gyp:default_plugin',
-        '../third_party/ppapi/ppapi.gyp:ppapi_tests',
+        '../ppapi/ppapi.gyp:ppapi_tests',
         '../webkit/support/webkit_support.gyp:copy_npapi_layout_test_plugin',
       ],
       'include_dirs': [
diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS
index b7bf978..99df536 100644
--- a/chrome/renderer/DEPS
+++ b/chrome/renderer/DEPS
@@ -7,6 +7,7 @@ include_rules = [
   "+media/ffmpeg",
   "+media/filters",
   "+media/video",
+  "+ppapi/c",
   "+sandbox/src",
   "+skia/include",
   "+webkit/extensions",
diff --git a/chrome/renderer/pepper_plugin_delegate_impl.cc b/chrome/renderer/pepper_plugin_delegate_impl.cc
index ecaf0e4..b8ab08d 100644
--- a/chrome/renderer/pepper_plugin_delegate_impl.cc
+++ b/chrome/renderer/pepper_plugin_delegate_impl.cc
@@ -25,7 +25,7 @@
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/webplugin_delegate_proxy.h"
 #include "grit/locale_settings.h"
-#include "third_party/ppapi/c/dev/pp_video_dev.h"
+#include "ppapi/c/dev/pp_video_dev.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFileChooserCompletion.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFileChooserParams.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPluginContainer.h"
diff --git a/chrome/renderer/pepper_plugin_delegate_impl.h b/chrome/renderer/pepper_plugin_delegate_impl.h
index a1fb6a0..90c659a 100644
--- a/chrome/renderer/pepper_plugin_delegate_impl.h
+++ b/chrome/renderer/pepper_plugin_delegate_impl.h
@@ -12,7 +12,7 @@
 #include "base/basictypes.h"
 #include "base/id_map.h"
 #include "base/weak_ptr.h"
-#include "third_party/ppapi/c/pp_errors.h"
+#include "ppapi/c/pp_errors.h"
 #include "webkit/glue/plugins/pepper_plugin_delegate.h"
 #include "webkit/glue/plugins/pepper_plugin_instance.h"
 
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc
index 195c5e0..36eeab8 100644
--- a/chrome/test/ui/ppapi_uitest.cc
+++ b/chrome/test/ui/ppapi_uitest.cc
@@ -57,7 +57,6 @@ class PPAPITest : public UITest {
   void RunTest(const std::string& test_case) {
     FilePath test_path;
     PathService::Get(base::DIR_SOURCE_ROOT, &test_path);
-    test_path = test_path.Append(FILE_PATH_LITERAL("third_party"));
     test_path = test_path.Append(FILE_PATH_LITERAL("ppapi"));
     test_path = test_path.Append(FILE_PATH_LITERAL("tests"));
     test_path = test_path.Append(FILE_PATH_LITERAL("test_case.html"));