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

Side by Side Diff: content/public/test/unittest_test_suite.cc

Issue 878413002: Wire the scheduler up in TestBlinkWebUnitTestSupport (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/public/test/unittest_test_suite.h" 5 #include "content/public/test/unittest_test_suite.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/rand_util.h" 8 #include "base/rand_util.h"
9 #include "base/test/test_suite.h" 9 #include "base/test/test_suite.h"
10 #include "content/renderer/scheduler/renderer_scheduler.h"
10 #if !defined(OS_IOS) 11 #if !defined(OS_IOS)
11 #include "content/test/test_blink_web_unit_test_support.h" 12 #include "content/test/test_blink_web_unit_test_support.h"
12 #endif 13 #endif
13 #include "third_party/WebKit/public/web/WebKit.h" 14 #include "third_party/WebKit/public/web/WebKit.h"
14 15
15 namespace content { 16 namespace content {
16 17
17 UnitTestTestSuite::UnitTestTestSuite(base::TestSuite* test_suite) 18 UnitTestTestSuite::UnitTestTestSuite(base::TestSuite* test_suite)
18 : test_suite_(test_suite) { 19 : test_suite_(test_suite) {
19 DCHECK(test_suite); 20 DCHECK(test_suite);
20 #if !defined(OS_IOS) 21 #if !defined(OS_IOS)
21 blink_test_support_.reset(new TestBlinkWebUnitTestSupport); 22 blink_test_support_.reset(
23 new TestBlinkWebUnitTestSupport(RendererScheduler::Create().release()));
22 #endif 24 #endif
23 } 25 }
24 26
25 UnitTestTestSuite::~UnitTestTestSuite() { 27 UnitTestTestSuite::~UnitTestTestSuite() {
26 #if !defined(OS_IOS) 28 #if !defined(OS_IOS)
27 blink_test_support_.reset(); 29 blink_test_support_.reset();
28 #endif 30 #endif
29 } 31 }
30 32
31 int UnitTestTestSuite::Run() { 33 int UnitTestTestSuite::Run() {
32 return test_suite_->Run(); 34 return test_suite_->Run();
33 } 35 }
34 36
35 } // namespace content 37 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/test/blink_test_environment.cc » ('j') | content/test/test_blink_web_unit_test_support.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698