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

Unified Diff: net/base/run_all_unittests.cc

Issue 12811011: net: move test files out of net/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android Created 7 years, 9 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 | « net/base/net_test_suite.cc ('k') | net/net.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/run_all_unittests.cc
diff --git a/net/base/run_all_unittests.cc b/net/base/run_all_unittests.cc
deleted file mode 100644
index 4a5f997b95e70840424909136e8a9f63a5af3e61..0000000000000000000000000000000000000000
--- a/net/base/run_all_unittests.cc
+++ /dev/null
@@ -1,53 +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 "base/metrics/statistics_recorder.h"
-#include "build/build_config.h"
-#include "crypto/nss_util.h"
-#include "net/base/net_test_suite.h"
-#include "net/socket/client_socket_pool_base.h"
-#include "net/socket/ssl_server_socket.h"
-#include "net/spdy/spdy_session.h"
-
-#if defined(OS_ANDROID)
-#include "base/android/jni_android.h"
-#include "net/android/net_jni_registrar.h"
-#endif
-
-#if !defined(OS_IOS)
-#include "net/proxy/proxy_resolver_v8.h"
-#endif
-
-using net::internal::ClientSocketPoolBaseHelper;
-using net::SpdySession;
-
-int main(int argc, char** argv) {
- // Record histograms, so we can get histograms data in tests.
- base::StatisticsRecorder::Initialize();
-
-#if defined(OS_ANDROID)
- // Register JNI bindings for android. Doing it early as the test suite setup
- // may initiate a call to Java.
- net::android::RegisterJni(base::android::AttachCurrentThread());
-#endif
-
- NetTestSuite test_suite(argc, argv);
- ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false);
-
-#if defined(OS_WIN)
- // We want to be sure to init NSPR on the main thread.
- crypto::EnsureNSPRInit();
-#endif
-
- // Enable support for SSL server sockets, which must be done while
- // single-threaded.
- net::EnableSSLServerSockets();
-
-#if !defined(OS_IOS)
- // This has to be done on the main thread.
- net::ProxyResolverV8::RememberDefaultIsolate();
-#endif
-
- return test_suite.Run();
-}
« no previous file with comments | « net/base/net_test_suite.cc ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698