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

Unified Diff: components/navigation_interception/navigation_params_android.cc

Issue 2745033002: Fix LoadDataWithBaseUrlTest#testloadDataWithBaseUrlCallsOnPageStarted with PlzNavigate. (Closed)
Patch Set: fix unittest Created 3 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
Index: components/navigation_interception/navigation_params_android.cc
diff --git a/components/navigation_interception/navigation_params_android.cc b/components/navigation_interception/navigation_params_android.cc
index e459d36273a8019916c352255b9b602585793392..2b063ae7c6427e1c11d118510f4e5706d03cf7da 100644
--- a/components/navigation_interception/navigation_params_android.cc
+++ b/components/navigation_interception/navigation_params_android.cc
@@ -16,8 +16,13 @@ base::android::ScopedJavaLocalRef<jobject> CreateJavaNavigationParams(
JNIEnv* env,
const NavigationParams& params,
bool has_user_gesture_carryover) {
+ const GURL& url = params.base_url_for_data_url().is_empty()
+ ? params.url()
+ : params.base_url_for_data_url();
+ DCHECK(params.base_url_for_data_url().is_empty() ||
+ params.url().SchemeIs(url::kDataScheme));
ScopedJavaLocalRef<jstring> jstring_url =
- ConvertUTF8ToJavaString(env, params.url().spec());
+ ConvertUTF8ToJavaString(env, url.spec());
ScopedJavaLocalRef<jstring> jstring_referrer =
ConvertUTF8ToJavaString(env, params.referrer().url.spec());
« no previous file with comments | « components/navigation_interception/navigation_params.cc ('k') | content/browser/frame_host/navigation_handle_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698