Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/test/test_suite.h" | 8 #include "base/test/test_suite.h" |
| 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" | 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" |
| 10 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebKitPlatfo rmSupport.h" | 10 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebKitPlatfo rmSupport.h" |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 34 DCHECK(test_suite); | 34 DCHECK(test_suite); |
| 35 webkit_platform_support_.reset(new UnitTestWebKitPlatformSupport); | 35 webkit_platform_support_.reset(new UnitTestWebKitPlatformSupport); |
| 36 WebKit::initialize(webkit_platform_support_.get()); | 36 WebKit::initialize(webkit_platform_support_.get()); |
| 37 } | 37 } |
| 38 | 38 |
| 39 UnitTestTestSuite::~UnitTestTestSuite() { | 39 UnitTestTestSuite::~UnitTestTestSuite() { |
| 40 WebKit::shutdown(); | 40 WebKit::shutdown(); |
| 41 } | 41 } |
| 42 | 42 |
| 43 int UnitTestTestSuite::Run() { | 43 int UnitTestTestSuite::Run() { |
| 44 test_suite_->WatchAtExitManager(); | |
|
Paweł Hajdan Jr.
2012/06/20 07:47:13
This should always be run, for all test suites (ma
Scott Byer
2012/06/21 00:05:41
I was trying to be conservative and not spew warni
| |
| 44 return test_suite_->Run(); | 45 return test_suite_->Run(); |
| 45 } | 46 } |
| 46 | 47 |
| 47 } // namespace content | 48 } // namespace content |
| OLD | NEW |