5 files changed, 8 insertions, 9 deletions
diff --git a/cc/test/CCGeometryTestUtils.cpp b/cc/test/CCGeometryTestUtils.cpp
index ced302c..a079475 100644
--- a/cc/test/CCGeometryTestUtils.cpp
+++ b/cc/test/CCGeometryTestUtils.cpp
@@ -6,7 +6,7 @@
 
 #include "CCGeometryTestUtils.h"
 
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
 #include <public/WebTransformationMatrix.h>
 
 namespace WebKitTests {
diff --git a/cc/test/CCLayerTestCommon.cpp b/cc/test/CCLayerTestCommon.cpp
index 988902b..f62c488 100644
--- a/cc/test/CCLayerTestCommon.cpp
+++ b/cc/test/CCLayerTestCommon.cpp
@@ -6,8 +6,7 @@
 
 #include "CCLayerTestCommon.h"
 #include "CCDrawQuad.h"
-
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
 
 namespace CCLayerTestCommon {
 
diff --git a/cc/test/CCSchedulerTestCommon.h b/cc/test/CCSchedulerTestCommon.h
index ba9c819..2f6660b 100644
--- a/cc/test/CCSchedulerTestCommon.h
+++ b/cc/test/CCSchedulerTestCommon.h
@@ -9,7 +9,7 @@
 #include "CCFrameRateController.h"
 #include "CCThread.h"
 #include "base/threading/platform_thread.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
 #include <wtf/OwnPtr.h>
 
 namespace WebKitTests {
diff --git a/cc/test/FakeGraphicsContext3DTest.cpp b/cc/test/FakeGraphicsContext3DTest.cpp
index 59afd04..85920f9 100644
--- a/cc/test/FakeGraphicsContext3DTest.cpp
+++ b/cc/test/FakeGraphicsContext3DTest.cpp
@@ -5,8 +5,8 @@
 #include "config.h"
 
 #include "FakeWebGraphicsContext3D.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
diff --git a/cc/test/run_all_unittests.cc b/cc/test/run_all_unittests.cc
index ca2eccd..9132bab 100644
--- a/cc/test/run_all_unittests.cc
+++ b/cc/test/run_all_unittests.cc
@@ -5,16 +5,16 @@
 #include "base/message_loop.h"
 #include "base/test/test_suite.h"
 #include "cc/test/test_webkit_platform.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
-#include <gmock/gmock.h>
 
 int main(int argc, char** argv) {
   ::testing::InitGoogleMock(&argc, argv);
-  TestSuite testSuite(argc, argv);
+  TestSuite test_suite(argc, argv);
   cc::TestWebKitPlatform platform;
   MessageLoop message_loop;
   WebKit::Platform::initialize(&platform);
-  int result = testSuite.Run();
+  int result = test_suite.Run();
   WebKit::Platform::shutdown();
 
   return result;