data_with_base_url

content/browser/frame_host/navigation_controller_impl.cc

Index: content/browser/frame_host/navigation_controller_impl.cc
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
index ce13a1605d44d5078abbbaa310eb403700cf2e61..d9b831736de50e308d39936c8f9792e29211ffaf 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -794,9 +794,15 @@ void NavigationControllerImpl::LoadURLWithParams(const LoadURLParams& params) {
           params.browser_initiated_post_data.get());
       break;
     case LOAD_TYPE_DATA:
-      entry->SetBaseURLForDataURL(params.base_url_for_data_url);
+      // entry->SetBaseURLForDataURL(params.base_url_for_data_url);
       entry->SetVirtualURL(params.virtual_url_for_data_url);
       entry->SetCanLoadLocalResources(params.can_load_local_resources);
+
+      if (params.base_url_for_data_url.is_valid()) {
+        // TODO(boliu): This should be done on client side.
+        entry->SetDataURLWithBaseURL(params.url);
+        entry->SetURL(params.base_url_for_data_url);
+      }
       break;
     default:
       NOTREACHED();