cc: Change gtest includes to the style used in chromium.
BUG=144577
TEST=cc_unittests
[email protected]
Review URL: https://codereview.chromium.org/11035010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159601 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/cc/CCActiveAnimationTest.cpp b/cc/CCActiveAnimationTest.cpp
index a29da0b..5dabbb6 100644
--- a/cc/CCActiveAnimationTest.cpp
+++ b/cc/CCActiveAnimationTest.cpp
@@ -7,8 +7,8 @@
#include "CCActiveAnimation.h"
#include "CCAnimationTestCommon.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/Vector.h>
using namespace WebKitTests;
diff --git a/cc/CCDamageTrackerTest.cpp b/cc/CCDamageTrackerTest.cpp
index ee05a3a..2f8adcf28 100644
--- a/cc/CCDamageTrackerTest.cpp
+++ b/cc/CCDamageTrackerTest.cpp
@@ -12,7 +12,7 @@
#include "CCLayerTreeHostCommon.h"
#include "CCMathUtil.h"
#include "CCSingleThreadProxy.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebFilterOperation.h>
#include <public/WebFilterOperations.h>
diff --git a/cc/CCDelayBasedTimeSourceTest.cpp b/cc/CCDelayBasedTimeSourceTest.cpp
index a8c8768..1819123 100644
--- a/cc/CCDelayBasedTimeSourceTest.cpp
+++ b/cc/CCDelayBasedTimeSourceTest.cpp
@@ -8,7 +8,7 @@
#include "CCSchedulerTestCommon.h"
#include "CCThread.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
#include <wtf/RefPtr.h>
using namespace cc;
diff --git a/cc/CCDelegatedRendererLayerImplTest.cpp b/cc/CCDelegatedRendererLayerImplTest.cpp
index fe622949..2fdf5f0 100644
--- a/cc/CCDelegatedRendererLayerImplTest.cpp
+++ b/cc/CCDelegatedRendererLayerImplTest.cpp
@@ -19,7 +19,7 @@
#include "FakeWebGraphicsContext3D.h"
#include "MockCCQuadCuller.h"
#include "cc/scoped_ptr_vector.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h>
using WebKit::FakeWebCompositorOutputSurface;
diff --git a/cc/CCDrawQuadTest.cpp b/cc/CCDrawQuadTest.cpp
index 4970cd6..0e1ef89 100644
--- a/cc/CCDrawQuadTest.cpp
+++ b/cc/CCDrawQuadTest.cpp
@@ -16,7 +16,7 @@
#include "CCTextureDrawQuad.h"
#include "CCTileDrawQuad.h"
#include "CCYUVVideoDrawQuad.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h>
using WebKit::WebTransformationMatrix;
diff --git a/cc/CCFrameRateControllerTest.cpp b/cc/CCFrameRateControllerTest.cpp
index 87f24c7f..44a5173 100644
--- a/cc/CCFrameRateControllerTest.cpp
+++ b/cc/CCFrameRateControllerTest.cpp
@@ -7,7 +7,7 @@
#include "CCFrameRateController.h"
#include "CCSchedulerTestCommon.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
using namespace cc;
using namespace WebKitTests;
diff --git a/cc/CCKeyframedAnimationCurveTest.cpp b/cc/CCKeyframedAnimationCurveTest.cpp
index de45c3e..428b748 100644
--- a/cc/CCKeyframedAnimationCurveTest.cpp
+++ b/cc/CCKeyframedAnimationCurveTest.cpp
@@ -6,8 +6,8 @@
#include "CCKeyframedAnimationCurve.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformOperations.h>
#include <public/WebTransformationMatrix.h>
#include <wtf/OwnPtr.h>
diff --git a/cc/CCLayerAnimationControllerTest.cpp b/cc/CCLayerAnimationControllerTest.cpp
index 804b841..6ee5110 100644
--- a/cc/CCLayerAnimationControllerTest.cpp
+++ b/cc/CCLayerAnimationControllerTest.cpp
@@ -9,8 +9,8 @@
#include "CCActiveAnimation.h"
#include "CCAnimationCurve.h"
#include "CCAnimationTestCommon.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h>
#include <wtf/Vector.h>
diff --git a/cc/CCLayerImplTest.cpp b/cc/CCLayerImplTest.cpp
index 1115ec0..ceedb89 100644
--- a/cc/CCLayerImplTest.cpp
+++ b/cc/CCLayerImplTest.cpp
@@ -7,8 +7,8 @@
#include "CCLayerImpl.h"
#include "CCSingleThreadProxy.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebFilterOperation.h>
#include <public/WebFilterOperations.h>
diff --git a/cc/CCLayerIteratorTest.cpp b/cc/CCLayerIteratorTest.cpp
index 47e43be..36d22dad 100644
--- a/cc/CCLayerIteratorTest.cpp
+++ b/cc/CCLayerIteratorTest.cpp
@@ -8,8 +8,8 @@
#include "CCLayerTreeHostCommon.h"
#include "LayerChromium.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h>
using namespace cc;
diff --git a/cc/CCLayerQuadTest.cpp b/cc/CCLayerQuadTest.cpp
index d40bb142..6a1b8ff 100644
--- a/cc/CCLayerQuadTest.cpp
+++ b/cc/CCLayerQuadTest.cpp
@@ -6,7 +6,7 @@
#include "CCLayerQuad.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
using namespace cc;
diff --git a/cc/CCLayerSorterTest.cpp b/cc/CCLayerSorterTest.cpp
index 0bbc92c..e3df5d5 100644
--- a/cc/CCLayerSorterTest.cpp
+++ b/cc/CCLayerSorterTest.cpp
@@ -9,7 +9,7 @@
#include "CCLayerImpl.h"
#include "CCMathUtil.h"
#include "CCSingleThreadProxy.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h>
using namespace cc;
diff --git a/cc/CCLayerTreeHostCommonTest.cpp b/cc/CCLayerTreeHostCommonTest.cpp
index f073976..c23ae32 100644
--- a/cc/CCLayerTreeHostCommonTest.cpp
+++ b/cc/CCLayerTreeHostCommonTest.cpp
@@ -19,8 +19,8 @@
#include "ContentLayerChromiumClient.h"
#include "LayerChromium.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h>
using namespace cc;
diff --git a/cc/CCLayerTreeHostImplTest.cpp b/cc/CCLayerTreeHostImplTest.cpp
index c71f3370..63cfa6c4 100644
--- a/cc/CCLayerTreeHostImplTest.cpp
+++ b/cc/CCLayerTreeHostImplTest.cpp
@@ -32,8 +32,8 @@
#include "FakeWebCompositorOutputSurface.h"
#include "FakeWebGraphicsContext3D.h"
#include "FakeWebScrollbarThemeGeometry.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebVideoFrame.h>
#include <public/WebVideoFrameProvider.h>
diff --git a/cc/CCLayerTreeHostTest.cpp b/cc/CCLayerTreeHostTest.cpp
index 25983e3..deb40398 100644
--- a/cc/CCLayerTreeHostTest.cpp
+++ b/cc/CCLayerTreeHostTest.cpp
@@ -19,7 +19,7 @@
#include "ContentLayerChromiumClient.h"
#include "Extensions3DChromium.h"
#include "FakeWebCompositorOutputSurface.h"
-#include <gmock/gmock.h>
+#include "testing/gmock/include/gmock/gmock.h"
#include <public/Platform.h>
#include <public/WebLayerScrollClient.h>
#include <public/WebSize.h>
diff --git a/cc/CCMathUtilTest.cpp b/cc/CCMathUtilTest.cpp
index 530d7da..5fd1e8ec 100644
--- a/cc/CCMathUtilTest.cpp
+++ b/cc/CCMathUtilTest.cpp
@@ -8,8 +8,8 @@
#include "CCGeometryTestUtils.h"
#include "FloatRect.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h>
using namespace cc;
diff --git a/cc/CCOcclusionTrackerTest.cpp b/cc/CCOcclusionTrackerTest.cpp
index d5641a4e..d51356e 100644
--- a/cc/CCOcclusionTrackerTest.cpp
+++ b/cc/CCOcclusionTrackerTest.cpp
@@ -17,8 +17,8 @@
#include "CCSingleThreadProxy.h"
#include "LayerChromium.h"
#include "Region.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebFilterOperation.h>
#include <public/WebFilterOperations.h>
#include <public/WebTransformationMatrix.h>
diff --git a/cc/CCPrioritizedTextureTest.cpp b/cc/CCPrioritizedTextureTest.cpp
index d3596da..f5b5de2 100644
--- a/cc/CCPrioritizedTextureTest.cpp
+++ b/cc/CCPrioritizedTextureTest.cpp
@@ -12,7 +12,7 @@
#include "CCTiledLayerTestCommon.h"
#include "FakeCCGraphicsContext.h"
#include "WebCompositorInitializer.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
using namespace cc;
using namespace WebKitTests;
diff --git a/cc/CCQuadCullerTest.cpp b/cc/CCQuadCullerTest.cpp
index 0a9d360..db559b0 100644
--- a/cc/CCQuadCullerTest.cpp
+++ b/cc/CCQuadCullerTest.cpp
@@ -14,8 +14,8 @@
#include "CCSingleThreadProxy.h"
#include "CCTileDrawQuad.h"
#include "CCTiledLayerImpl.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h>
using namespace cc;
diff --git a/cc/CCRenderPassTest.cpp b/cc/CCRenderPassTest.cpp
index eed74e51..6c7423f6b 100644
--- a/cc/CCRenderPassTest.cpp
+++ b/cc/CCRenderPassTest.cpp
@@ -8,7 +8,7 @@
#include "CCCheckerboardDrawQuad.h"
#include "CCGeometryTestUtils.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebFilterOperations.h>
#include <public/WebTransformationMatrix.h>
diff --git a/cc/CCRenderSurfaceFiltersTest.cpp b/cc/CCRenderSurfaceFiltersTest.cpp
index fa76803b..66d3e80 100644
--- a/cc/CCRenderSurfaceFiltersTest.cpp
+++ b/cc/CCRenderSurfaceFiltersTest.cpp
@@ -7,7 +7,7 @@
#include "CCRenderSurfaceFilters.h"
#include "CompositorFakeWebGraphicsContext3D.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebFilterOperation.h>
#include <public/WebFilterOperations.h>
#include <wtf/RefPtr.h>
diff --git a/cc/CCRenderSurfaceTest.cpp b/cc/CCRenderSurfaceTest.cpp
index cbba891..35f6cc0 100644
--- a/cc/CCRenderSurfaceTest.cpp
+++ b/cc/CCRenderSurfaceTest.cpp
@@ -14,8 +14,8 @@
#include "MockCCQuadCuller.h"
#include "cc/own_ptr_vector.h"
#include "cc/scoped_ptr_vector.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h>
using namespace cc;
diff --git a/cc/CCRendererGLTest.cpp b/cc/CCRendererGLTest.cpp
index f61f2159c..ba72399 100644
--- a/cc/CCRendererGLTest.cpp
+++ b/cc/CCRendererGLTest.cpp
@@ -15,8 +15,8 @@
#include "FakeWebGraphicsContext3D.h"
#include "GraphicsContext3D.h"
#include "WebCompositorInitializer.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h>
using namespace cc;
diff --git a/cc/CCRendererSoftwareTest.cpp b/cc/CCRendererSoftwareTest.cpp
index 48b98e7..fb057c8 100644
--- a/cc/CCRendererSoftwareTest.cpp
+++ b/cc/CCRendererSoftwareTest.cpp
@@ -19,8 +19,8 @@
#include "CCTileDrawQuad.h"
#include "FakeWebCompositorSoftwareOutputDevice.h"
#include "FakeWebCompositorOutputSurface.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/OwnArrayPtr.h>
using namespace cc;
diff --git a/cc/CCResourceProviderTest.cpp b/cc/CCResourceProviderTest.cpp
index 69a4de24..3e090cf 100644
--- a/cc/CCResourceProviderTest.cpp
+++ b/cc/CCResourceProviderTest.cpp
@@ -11,7 +11,7 @@
#include "CompositorFakeWebGraphicsContext3D.h"
#include "Extensions3DChromium.h"
#include "FakeWebCompositorOutputSurface.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebGraphicsContext3D.h>
#include <wtf/HashMap.h>
#include <wtf/OwnArrayPtr.h>
diff --git a/cc/CCSchedulerStateMachineTest.cpp b/cc/CCSchedulerStateMachineTest.cpp
index 9260e89..9d4796e 100644
--- a/cc/CCSchedulerStateMachineTest.cpp
+++ b/cc/CCSchedulerStateMachineTest.cpp
@@ -6,7 +6,7 @@
#include "CCSchedulerStateMachine.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
using namespace cc;
using namespace WTF;
diff --git a/cc/CCSchedulerTest.cpp b/cc/CCSchedulerTest.cpp
index 3ff6cea5..690c0a5 100644
--- a/cc/CCSchedulerTest.cpp
+++ b/cc/CCSchedulerTest.cpp
@@ -7,8 +7,8 @@
#include "CCScheduler.h"
#include "CCSchedulerTestCommon.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>
using namespace cc;
diff --git a/cc/CCScopedTextureTest.cpp b/cc/CCScopedTextureTest.cpp
index 88194b8..68745277 100644
--- a/cc/CCScopedTextureTest.cpp
+++ b/cc/CCScopedTextureTest.cpp
@@ -11,7 +11,7 @@
#include "CCTiledLayerTestCommon.h"
#include "FakeCCGraphicsContext.h"
#include "GraphicsContext3D.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
using namespace cc;
using namespace WebKit;
diff --git a/cc/CCScrollbarAnimationControllerLinearFadeTest.cpp b/cc/CCScrollbarAnimationControllerLinearFadeTest.cpp
index 0371765..d4b7860 100644
--- a/cc/CCScrollbarAnimationControllerLinearFadeTest.cpp
+++ b/cc/CCScrollbarAnimationControllerLinearFadeTest.cpp
@@ -8,7 +8,7 @@
#include "CCScrollbarLayerImpl.h"
#include "CCSingleThreadProxy.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
#include <wtf/OwnPtr.h>
using namespace cc;
diff --git a/cc/CCSolidColorLayerImplTest.cpp b/cc/CCSolidColorLayerImplTest.cpp
index 8380d681..87bf7cb 100644
--- a/cc/CCSolidColorLayerImplTest.cpp
+++ b/cc/CCSolidColorLayerImplTest.cpp
@@ -11,8 +11,8 @@
#include "CCSingleThreadProxy.h"
#include "CCSolidColorDrawQuad.h"
#include "MockCCQuadCuller.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
using namespace cc;
using namespace CCLayerTestCommon;
diff --git a/cc/CCTextureUpdateControllerTest.cpp b/cc/CCTextureUpdateControllerTest.cpp
index 01101e62..464e46f 100644
--- a/cc/CCTextureUpdateControllerTest.cpp
+++ b/cc/CCTextureUpdateControllerTest.cpp
@@ -12,7 +12,7 @@
#include "FakeWebCompositorOutputSurface.h"
#include "FakeWebGraphicsContext3D.h"
#include "WebCompositorInitializer.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebThread.h>
#include <wtf/RefPtr.h>
diff --git a/cc/CCThreadTaskTest.cpp b/cc/CCThreadTaskTest.cpp
index 1ccb968..3f653d2fc 100644
--- a/cc/CCThreadTaskTest.cpp
+++ b/cc/CCThreadTaskTest.cpp
@@ -6,8 +6,8 @@
#include "CCThreadTask.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
using namespace cc;
using namespace WTF;
diff --git a/cc/CCThreadedTest.cpp b/cc/CCThreadedTest.cpp
index 44890d1..73627472 100644
--- a/cc/CCThreadedTest.cpp
+++ b/cc/CCThreadedTest.cpp
@@ -23,7 +23,7 @@
#include "FakeWebCompositorOutputSurface.h"
#include "FakeWebGraphicsContext3D.h"
#include "LayerChromium.h"
-#include <gmock/gmock.h>
+#include "testing/gmock/include/gmock/gmock.h"
#include <public/Platform.h>
#include <public/WebCompositorSupport.h>
#include <public/WebFilterOperation.h>
diff --git a/cc/CCThreadedTest.h b/cc/CCThreadedTest.h
index 53e6fe0..61a08b5 100644
--- a/cc/CCThreadedTest.h
+++ b/cc/CCThreadedTest.h
@@ -9,7 +9,7 @@
#include "CCLayerTreeHostImpl.h"
#include "CCScopedThreadProxy.h"
#include "CompositorFakeWebGraphicsContext3D.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebAnimationDelegate.h>
#include <public/WebThread.h>
diff --git a/cc/CCTiledLayerImplTest.cpp b/cc/CCTiledLayerImplTest.cpp
index 5573de4..3e58080 100644
--- a/cc/CCTiledLayerImplTest.cpp
+++ b/cc/CCTiledLayerImplTest.cpp
@@ -12,8 +12,8 @@
#include "CCSingleThreadProxy.h"
#include "CCTileDrawQuad.h"
#include "MockCCQuadCuller.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
using namespace cc;
using namespace CCLayerTestCommon;
diff --git a/cc/CCTimerTest.cpp b/cc/CCTimerTest.cpp
index aabc42fa2..f29b3e3 100644
--- a/cc/CCTimerTest.cpp
+++ b/cc/CCTimerTest.cpp
@@ -7,7 +7,7 @@
#include "CCTimer.h"
#include "CCSchedulerTestCommon.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
using namespace cc;
using namespace WebKitTests;
diff --git a/cc/ContentLayerChromiumTest.cpp b/cc/ContentLayerChromiumTest.cpp
index 1314b20..8e6e7e65 100644
--- a/cc/ContentLayerChromiumTest.cpp
+++ b/cc/ContentLayerChromiumTest.cpp
@@ -11,7 +11,7 @@
#include "CCRenderingStats.h"
#include "ContentLayerChromiumClient.h"
#include "skia/ext/platform_canvas.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebFloatRect.h>
#include <public/WebRect.h>
#include <wtf/OwnPtr.h>
diff --git a/cc/FloatQuadTest.cpp b/cc/FloatQuadTest.cpp
index ff8cffe7..aac1a4a 100644
--- a/cc/FloatQuadTest.cpp
+++ b/cc/FloatQuadTest.cpp
@@ -6,7 +6,7 @@
#include "CCMathUtil.h"
#include "FloatQuad.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h>
using namespace cc;
diff --git a/cc/LayerChromiumTest.cpp b/cc/LayerChromiumTest.cpp
index 9f5401b..10665dc 100644
--- a/cc/LayerChromiumTest.cpp
+++ b/cc/LayerChromiumTest.cpp
@@ -14,8 +14,8 @@
#include "FakeCCLayerTreeHostClient.h"
#include "LayerPainterChromium.h"
#include "WebCompositorInitializer.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h>
using namespace cc;
diff --git a/cc/ScrollbarLayerChromiumTest.cpp b/cc/ScrollbarLayerChromiumTest.cpp
index c6e637f..ac79bd9 100644
--- a/cc/ScrollbarLayerChromiumTest.cpp
+++ b/cc/ScrollbarLayerChromiumTest.cpp
@@ -11,7 +11,7 @@
#include "CCSingleThreadProxy.h"
#include "FakeWebScrollbarThemeGeometry.h"
#include "TreeSynchronizer.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebScrollbar.h>
#include <public/WebScrollbarThemeGeometry.h>
#include <public/WebScrollbarThemePainter.h>
diff --git a/cc/TextureCopierTest.cpp b/cc/TextureCopierTest.cpp
index 9b017ba3..1c1fb1d 100644
--- a/cc/TextureCopierTest.cpp
+++ b/cc/TextureCopierTest.cpp
@@ -8,8 +8,8 @@
#include "FakeWebGraphicsContext3D.h"
#include "GraphicsContext3D.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/RefPtr.h>
using namespace cc;
diff --git a/cc/TextureLayerChromiumTest.cpp b/cc/TextureLayerChromiumTest.cpp
index 0651fd9..c57b55fc 100644
--- a/cc/TextureLayerChromiumTest.cpp
+++ b/cc/TextureLayerChromiumTest.cpp
@@ -9,8 +9,8 @@
#include "CCLayerTreeHost.h"
#include "FakeCCLayerTreeHostClient.h"
#include "WebCompositorInitializer.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
using namespace cc;
using ::testing::Mock;
diff --git a/cc/ThrottledTextureUploaderTest.cpp b/cc/ThrottledTextureUploaderTest.cpp
index 06ebd61..816e3a8 100644
--- a/cc/ThrottledTextureUploaderTest.cpp
+++ b/cc/ThrottledTextureUploaderTest.cpp
@@ -10,8 +10,8 @@
#include "FakeWebGraphicsContext3D.h"
#include "GraphicsContext3D.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/RefPtr.h>
using namespace cc;
diff --git a/cc/TiledLayerChromiumTest.cpp b/cc/TiledLayerChromiumTest.cpp
index a30052c..74a3d58 100644
--- a/cc/TiledLayerChromiumTest.cpp
+++ b/cc/TiledLayerChromiumTest.cpp
@@ -18,7 +18,7 @@
#include "FakeCCLayerTreeHostClient.h"
#include "LayerPainterChromium.h"
#include "WebCompositorInitializer.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
#include <public/WebTransformationMatrix.h>
using namespace cc;
diff --git a/cc/TreeSynchronizerTest.cpp b/cc/TreeSynchronizerTest.cpp
index e307f29..2d66b29 100644
--- a/cc/TreeSynchronizerTest.cpp
+++ b/cc/TreeSynchronizerTest.cpp
@@ -13,7 +13,7 @@
#include "CCSingleThreadProxy.h"
#include "LayerChromium.h"
#include "Region.h"
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
using namespace cc;
using namespace WebKitTests;
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..f62c4886 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 ba9c819b..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;
