Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: cc/TreeSynchronizerTest.cpp

Issue 11035010: cc: Change gtest includes to the style used in chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: testSuite -> test_suite Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/TiledLayerChromiumTest.cpp ('k') | cc/test/CCGeometryTestUtils.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #include "TreeSynchronizer.h" 7 #include "TreeSynchronizer.h"
8 8
9 #include "CCAnimationTestCommon.h" 9 #include "CCAnimationTestCommon.h"
10 #include "CCLayerAnimationController.h" 10 #include "CCLayerAnimationController.h"
11 #include "CCLayerImpl.h" 11 #include "CCLayerImpl.h"
12 #include "CCProxy.h" 12 #include "CCProxy.h"
13 #include "CCSingleThreadProxy.h" 13 #include "CCSingleThreadProxy.h"
14 #include "LayerChromium.h" 14 #include "LayerChromium.h"
15 #include "Region.h" 15 #include "Region.h"
16 #include <gtest/gtest.h> 16 #include "testing/gtest/include/gtest/gtest.h"
17 17
18 using namespace cc; 18 using namespace cc;
19 using namespace WebKitTests; 19 using namespace WebKitTests;
20 20
21 namespace { 21 namespace {
22 22
23 class MockCCLayerImpl : public CCLayerImpl { 23 class MockCCLayerImpl : public CCLayerImpl {
24 public: 24 public:
25 static PassOwnPtr<MockCCLayerImpl> create(int layerId) 25 static PassOwnPtr<MockCCLayerImpl> create(int layerId)
26 { 26 {
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 396
397 EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layer AnimationController())->synchronizedAnimations()); 397 EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layer AnimationController())->synchronizedAnimations());
398 398
399 OwnPtr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(lay erTreeRoot.get(), nullptr, hostImpl.get()); 399 OwnPtr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(lay erTreeRoot.get(), nullptr, hostImpl.get());
400 ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), cc LayerTreeRoot.release(), hostImpl.get()); 400 ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), cc LayerTreeRoot.release(), hostImpl.get());
401 401
402 EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layerA nimationController())->synchronizedAnimations()); 402 EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(layerTreeRoot->layerA nimationController())->synchronizedAnimations());
403 } 403 }
404 404
405 } // namespace 405 } // namespace
OLDNEW
« no previous file with comments | « cc/TiledLayerChromiumTest.cpp ('k') | cc/test/CCGeometryTestUtils.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698