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

Side by Side Diff: content/test/content_test_suite.cc

Issue 8240006: Use a mocked compositor for unit tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 9 years, 1 month 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "content/test/content_test_suite.h" 5 #include "content/test/content_test_suite.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/browser/mock_content_browser_client.h" 9 #include "content/browser/mock_content_browser_client.h"
10 #include "content/browser/notification_service_impl.h" 10 #include "content/browser/notification_service_impl.h"
11 #include "content/public/common/content_client.h" 11 #include "content/public/common/content_client.h"
12 #include "content/public/common/content_paths.h" 12 #include "content/public/common/content_paths.h"
13 #include "content/test/test_content_client.h" 13 #include "content/test/test_content_client.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 #include "ui/base/ui_base_paths.h" 15 #include "ui/base/ui_base_paths.h"
16 #include "ui/gfx/compositor/compositor_test_support.h"
16 17
17 namespace { 18 namespace {
18 19
19 class TestContentClientInitializer : public testing::EmptyTestEventListener { 20 class TestContentClientInitializer : public testing::EmptyTestEventListener {
20 public: 21 public:
21 TestContentClientInitializer() { 22 TestContentClientInitializer() {
22 } 23 }
23 24
24 virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE { 25 virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE {
25 notification_service_.reset(new NotificationServiceImpl()); 26 notification_service_.reset(new NotificationServiceImpl());
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 59
59 ContentTestSuite::~ContentTestSuite() { 60 ContentTestSuite::~ContentTestSuite() {
60 } 61 }
61 62
62 void ContentTestSuite::Initialize() { 63 void ContentTestSuite::Initialize() {
63 base::TestSuite::Initialize(); 64 base::TestSuite::Initialize();
64 65
65 content::RegisterPathProvider(); 66 content::RegisterPathProvider();
66 ui::RegisterPathProvider(); 67 ui::RegisterPathProvider();
67 68
69 // Mock out the compositor on platforms that use it.
70 ui::CompositorTestSupport::SetupMockCompositor();
71
68 testing::TestEventListeners& listeners = 72 testing::TestEventListeners& listeners =
69 testing::UnitTest::GetInstance()->listeners(); 73 testing::UnitTest::GetInstance()->listeners();
70 listeners.Append(new TestContentClientInitializer); 74 listeners.Append(new TestContentClientInitializer);
71 } 75 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698