data_with_base_url

content/browser/frame_host/navigation_entry_impl.h

Index: content/browser/frame_host/navigation_entry_impl.h
diff --git a/content/browser/frame_host/navigation_entry_impl.h b/content/browser/frame_host/navigation_entry_impl.h
index 051a3ba909f524b31fa1385bbff4774379f73c74..7057eae79ab1b4bf8329e7e7413933553538a132 100644
--- a/content/browser/frame_host/navigation_entry_impl.h
+++ b/content/browser/frame_host/navigation_entry_impl.h
@@ -82,6 +82,8 @@ class CONTENT_EXPORT NavigationEntryImpl
   const GURL& GetURL() const override;
   void SetBaseURLForDataURL(const GURL& url) override;
   const GURL& GetBaseURLForDataURL() const override;
+  void SetDataURLWithBaseURL(const GURL& url) override;

[mnaganov (inactive), 2015/11/16 18:38:54]

The 'with' part is confusing, it sounds as you are setting both URLs here.
Should it be 'DataOfLoadDataWithBaseURL'?

+  const GURL& GetDataURLWithBaseURL() const override;
   void SetReferrer(const Referrer& referrer) override;
   const Referrer& GetReferrer() const override;
   void SetVirtualURL(const GURL& url) override;
@@ -409,7 +411,8 @@ class CONTENT_EXPORT NavigationEntryImpl
 
   // Used for specifying base URL for pages loaded via data URLs. Only used and
   // persisted by Android WebView.
-  GURL base_url_for_data_url_;
+  GURL base_url_for_data_url_;  // TODO(boliu): remove.
+  GURL data_url_with_base_url_;;
 
   // Whether the entry, while loading, was created for a renderer-initiated
   // navigation.  This dictates whether the URL should be displayed before the