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

Unified Diff: components/cronet/android/test/mock_url_request_job_factory.cc

Issue 743713002: Cronet Fix Channel Write after Close when request is canceled after success. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Matt's comments. Created 6 years 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: components/cronet/android/test/mock_url_request_job_factory.cc
diff --git a/components/cronet/android/test/mock_url_request_job_factory.cc b/components/cronet/android/test/mock_url_request_job_factory.cc
index d3757ccd06d74e5f83a534dd3647e4249c027a64..0a5fd7cbfa5a8b771e49fd2d4887b74ef372b525 100644
--- a/components/cronet/android/test/mock_url_request_job_factory.cc
+++ b/components/cronet/android/test/mock_url_request_job_factory.cc
@@ -11,6 +11,7 @@
#include "base/threading/sequenced_worker_pool.h"
#include "jni/MockUrlRequestJobFactory_jni.h"
#include "net/test/url_request/url_request_failed_job.h"
+#include "net/test/url_request/url_request_mock_data_job.h"
#include "net/test/url_request/url_request_mock_http_job.h"
namespace cronet {
@@ -18,6 +19,7 @@ namespace cronet {
void AddUrlInterceptors(JNIEnv* env, jclass jcaller) {
base::FilePath test_files_root;
PathService::Get(base::DIR_ANDROID_APP_DATA, &test_files_root);
+ net::URLRequestMockDataJob::AddUrlHandler();
mmenke 2014/12/10 20:59:14 nit: Per style guide, variables should be declare
mef 2014/12/10 23:23:35 Done.
net::URLRequestMockHTTPJob::AddUrlHandler(
test_files_root, new base::SequencedWorkerPool(1, "Worker"));
net::URLRequestFailedJob::AddUrlHandler();
@@ -42,6 +44,16 @@ jstring GetMockUrlWithFailure(JNIEnv* jenv,
return base::android::ConvertUTF8ToJavaString(jenv, url.spec()).Release();
}
+jstring GetMockUrlForData(JNIEnv* jenv,
+ jclass jcaller,
+ jstring jdata,
+ jint jdata_repeat_count) {
+ std::string data(base::android::ConvertJavaStringToUTF8(jenv, jdata));
+ GURL url(net::URLRequestMockDataJob::GetMockHttpUrl(data,
+ static_cast<int>(jdata_repeat_count)));
mmenke 2014/12/10 20:59:14 Is this cast needed? If so, what does jint really
mef 2014/12/10 23:23:35 Done.
+ return base::android::ConvertUTF8ToJavaString(jenv, url.spec()).Release();
+}
+
bool RegisterMockUrlRequestJobFactory(JNIEnv* env) {
return RegisterNativesImpl(env);
}

Powered by Google App Engine
This is Rietveld 408576698