Port project refator to master.

BUG=angle:537

Change-Id: I146cb04eb69fc8df152f8e6cd9f78f5e87e72a7e
Reviewed-on: https://chromium-review.googlesource.com/178785
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
diff --git a/DEPS b/DEPS
index 73679f5..0cec0b0 100644
--- a/DEPS
+++ b/DEPS
@@ -1,11 +1,11 @@
 deps = {
   "third_party/gyp":
-      "http://gyp.googlecode.com/svn/trunk@1767",
+      "http://gyp.googlecode.com/svn/trunk@1806",
 
-  "third_party/googletest":
+  "tests/third_party/googletest":
       "http://googletest.googlecode.com/svn/trunk@629",
 
-  "third_party/googlemock":
+  "tests/third_party/googlemock":
       "http://googlemock.googlecode.com/svn/trunk@410",
 }