| Index: content/test/blink_test_environment.cc
|
| diff --git a/content/test/webkit_support.cc b/content/test/blink_test_environment.cc
|
| similarity index 94%
|
| rename from content/test/webkit_support.cc
|
| rename to content/test/blink_test_environment.cc
|
| index a3e48edd92ccef80ae475fd56ae83df2d7c19a42..f64fc61889bbbe6fd22170c7be60f1d17d9d6f7f 100644
|
| --- a/content/test/webkit_support.cc
|
| +++ b/content/test/blink_test_environment.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "content/test/webkit_support.h"
|
| +#include "content/test/blink_test_environment.h"
|
|
|
| #include <string>
|
|
|
| @@ -81,7 +81,7 @@ TestEnvironment* test_environment;
|
|
|
| } // namespace
|
|
|
| -void SetUpTestEnvironmentForUnitTests() {
|
| +void SetUpBlinkTestEnvironment() {
|
| ParseBlinkCommandLineArgumentsForUnitTests();
|
|
|
| blink::WebRuntimeFeatures::enableExperimentalFeatures(true);
|
| @@ -107,7 +107,7 @@ void SetUpTestEnvironmentForUnitTests() {
|
| test_environment = new TestEnvironment;
|
| }
|
|
|
| -void TearDownTestEnvironment() {
|
| +void TearDownBlinkTestEnvironment() {
|
| // Flush any remaining messages before we kill ourselves.
|
| // http://code.google.com/p/chromium/issues/detail?id=9500
|
| base::RunLoop().RunUntilIdle();
|
| @@ -118,4 +118,12 @@ void TearDownTestEnvironment() {
|
| test_environment = NULL;
|
| }
|
|
|
| +void SetUpTestEnvironmentForUnitTests() {
|
| + SetUpBlinkTestEnvironment();
|
| +}
|
| +
|
| +void TearDownTestEnvironment() {
|
| + TearDownBlinkTestEnvironment();
|
| +}
|
| +
|
| } // namespace content
|
|
|