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

Unified Diff: content/test/blink_test_environment.cc

Issue 458013002: content: Add blink_test_environment.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/test/blink_test_environment.h ('k') | content/test/webkit_support.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « content/test/blink_test_environment.h ('k') | content/test/webkit_support.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698