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

Unified Diff: webkit/support/webkit_support.cc

Issue 23526028: Move source files from webkit/support to content/test (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 3 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 | « webkit/support/webkit_support.h ('k') | webkit/support/webkit_support.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/support/webkit_support.cc
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
deleted file mode 100644
index 6f9d41ac3d7306ee765f419693aa69a393aef9ca..0000000000000000000000000000000000000000
--- a/webkit/support/webkit_support.cc
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "webkit/support/webkit_support.h"
-
-#include "base/message_loop/message_loop.h"
-#include "base/run_loop.h"
-#include "third_party/WebKit/public/web/WebCache.h"
-#include "third_party/WebKit/public/web/WebKit.h"
-#include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
-#include "url/url_util.h"
-#include "webkit/common/user_agent/user_agent.h"
-#include "webkit/common/user_agent/user_agent_util.h"
-#include "webkit/support/test_webkit_platform_support.h"
-
-#if defined(OS_ANDROID)
-#include "base/android/jni_android.h"
-#include "net/android/network_library.h"
-#endif
-
-#if defined(OS_MACOSX)
-#include "base/test/mock_chrome_application_mac.h"
-#endif
-
-namespace {
-
-class TestEnvironment {
- public:
-#if defined(OS_ANDROID)
- // Android UI message loop goes through Java, so don't use it in tests.
- typedef base::MessageLoop MessageLoopType;
-#else
- typedef base::MessageLoopForUI MessageLoopType;
-#endif
-
- TestEnvironment() {
- main_message_loop_.reset(new MessageLoopType);
-
- // TestWebKitPlatformSupport must be instantiated after MessageLoopType.
- webkit_platform_support_.reset(new TestWebKitPlatformSupport);
- }
-
- TestWebKitPlatformSupport* webkit_platform_support() const {
- return webkit_platform_support_.get();
- }
-
- private:
- scoped_ptr<MessageLoopType> main_message_loop_;
- scoped_ptr<TestWebKitPlatformSupport> webkit_platform_support_;
-};
-
-TestEnvironment* test_environment;
-
-} // namespace
-
-namespace webkit_support {
-
-void SetUpTestEnvironmentForUnitTests() {
- WebKit::WebRuntimeFeatures::enableStableFeatures(true);
- WebKit::WebRuntimeFeatures::enableExperimentalFeatures(true);
- WebKit::WebRuntimeFeatures::enableTestOnlyFeatures(true);
-
-#if defined(OS_ANDROID)
- JNIEnv* env = base::android::AttachCurrentThread();
- net::android::RegisterNetworkLibrary(env);
-#endif
-
-#if defined(OS_MACOSX)
- mock_cr_app::RegisterMockCrApp();
-#endif
-
- // Explicitly initialize the GURL library before spawning any threads.
- // Otherwise crash may happend when different threads try to create a GURL
- // at same time.
- url_util::Initialize();
- test_environment = new TestEnvironment;
- webkit_glue::SetUserAgent(webkit_glue::BuildUserAgentFromProduct(
- "DumpRenderTree/0.0.0.0"), false);
-}
-
-void TearDownTestEnvironment() {
- // Flush any remaining messages before we kill ourselves.
- // http://code.google.com/p/chromium/issues/detail?id=9500
- base::RunLoop().RunUntilIdle();
-
- if (RunningOnValgrind())
- WebKit::WebCache::clear();
- WebKit::shutdown();
- delete test_environment;
- test_environment = NULL;
-}
-
-} // namespace webkit_support
« no previous file with comments | « webkit/support/webkit_support.h ('k') | webkit/support/webkit_support.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698