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

Unified Diff: net/test/embedded_test_server/android/embedded_test_server_android.cc

Issue 1210973002: Revert of [Android] Add a Java version of net::test_server::EmbeddedTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
Index: net/test/embedded_test_server/android/embedded_test_server_android.cc
diff --git a/net/test/embedded_test_server/android/embedded_test_server_android.cc b/net/test/embedded_test_server/android/embedded_test_server_android.cc
deleted file mode 100644
index 7cca9d933fcc86495da844b07b509f8d85bbbbcb..0000000000000000000000000000000000000000
--- a/net/test/embedded_test_server/android/embedded_test_server_android.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2015 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 "net/test/embedded_test_server/android/embedded_test_server_android.h"
-
-#include "base/android/jni_string.h"
-#include "base/android/scoped_java_ref.h"
-#include "base/bind.h"
-#include "base/files/file_path.h"
-#include "base/trace_event/trace_event.h"
-#include "net/test/jni/EmbeddedTestServer_jni.h"
-
-namespace net {
-namespace test_server {
-
-EmbeddedTestServerAndroid::EmbeddedTestServerAndroid(JNIEnv* env, jobject jobj)
- : weak_java_server_(env, jobj), test_server_() {
- Java_EmbeddedTestServer_setNativePtr(env, jobj,
- reinterpret_cast<intptr_t>(this));
-}
-
-EmbeddedTestServerAndroid::~EmbeddedTestServerAndroid() {
- JNIEnv* env = base::android::AttachCurrentThread();
- Java_EmbeddedTestServer_clearNativePtr(env, weak_java_server_.get(env).obj());
-}
-
-jboolean EmbeddedTestServerAndroid::InitializeAndWaitUntilReady(JNIEnv* env,
- jobject jobj) {
- return test_server_.InitializeAndWaitUntilReady();
-}
-
-jboolean EmbeddedTestServerAndroid::ShutdownAndWaitUntilComplete(JNIEnv* env,
- jobject jobj) {
- return test_server_.ShutdownAndWaitUntilComplete();
-}
-
-base::android::ScopedJavaLocalRef<jstring> EmbeddedTestServerAndroid::GetURL(
- JNIEnv* env,
- jobject jobj,
- jstring jrelative_url) const {
- const GURL gurl(test_server_.GetURL(
- base::android::ConvertJavaStringToUTF8(env, jrelative_url)));
- return base::android::ConvertUTF8ToJavaString(env, gurl.spec());
-}
-
-void EmbeddedTestServerAndroid::ServeFilesFromDirectory(
- JNIEnv* env,
- jobject jobj,
- jstring jdirectory_path) {
- const base::FilePath directory(
- base::android::ConvertJavaStringToUTF8(env, jdirectory_path));
- test_server_.ServeFilesFromDirectory(directory);
-}
-
-void EmbeddedTestServerAndroid::Destroy(JNIEnv* env, jobject jobj) {
- delete this;
-}
-
-static void Init(JNIEnv* env, jobject jobj) {
- TRACE_EVENT0("native", "EmbeddedTestServerAndroid::Init");
- new EmbeddedTestServerAndroid(env, jobj);
-}
-
-// static
-bool EmbeddedTestServerAndroid::RegisterEmbeddedTestServerAndroid(JNIEnv* env) {
- return RegisterNativesImpl(env);
-}
-
-} // namespace test_server
-} // namespace net

Powered by Google App Engine
This is Rietveld 408576698