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

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

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.h
diff --git a/net/test/embedded_test_server/android/embedded_test_server_android.h b/net/test/embedded_test_server/android/embedded_test_server_android.h
deleted file mode 100644
index fb03e37a252bd1580b42d2a5601a815c6664560f..0000000000000000000000000000000000000000
--- a/net/test/embedded_test_server/android/embedded_test_server_android.h
+++ /dev/null
@@ -1,51 +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.
-
-#ifndef NET_TEST_EMBEDDED_TEST_SERVER_ANDROID_EMBEDDED_TEST_SERVER_ANDROID_H_
-#define NET_TEST_EMBEDDED_TEST_SERVER_ANDROID_EMBEDDED_TEST_SERVER_ANDROID_H_
-
-#include <jni.h>
-
-#include "base/android/jni_weak_ref.h"
-#include "base/android/scoped_java_ref.h"
-#include "net/test/embedded_test_server/embedded_test_server.h"
-#include "net/test/embedded_test_server/http_request.h"
-#include "net/test/embedded_test_server/http_response.h"
-
-namespace net {
-namespace test_server {
-
-// The C++ side of the Java EmbeddedTestServer.
-class EmbeddedTestServerAndroid {
- public:
- EmbeddedTestServerAndroid(JNIEnv* env, jobject obj);
- ~EmbeddedTestServerAndroid();
-
- void Destroy(JNIEnv* env, jobject obj);
-
- jboolean InitializeAndWaitUntilReady(JNIEnv* env, jobject jobj);
-
- jboolean ShutdownAndWaitUntilComplete(JNIEnv* env, jobject jobj);
-
- base::android::ScopedJavaLocalRef<jstring>
- GetURL(JNIEnv* jenv, jobject jobj, jstring jrelative_url) const;
-
- void ServeFilesFromDirectory(JNIEnv* env,
- jobject jobj,
- jstring jdirectory_path);
-
- static bool RegisterEmbeddedTestServerAndroid(JNIEnv* env);
-
- private:
- JavaObjectWeakGlobalRef weak_java_server_;
-
- EmbeddedTestServer test_server_;
-
- DISALLOW_COPY_AND_ASSIGN(EmbeddedTestServerAndroid);
-};
-
-} // namespace test_server
-} // namespace net
-
-#endif // NET_TEST_EMBEDDED_TEST_SERVER_ANDROID_EMBEDDED_TEST_SERVER_ANDROID_H_
« no previous file with comments | « net/test/android/net_test_jni_onload.cc ('k') | net/test/embedded_test_server/android/embedded_test_server_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698