Set the original url correctly if the frame is loaded via loadData

content/shell/browser/shell.cc

Index: content/shell/browser/shell.cc
diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc
index 65491237ab7dea5c96a6478c50c9bb432274e85f..060c512354ee30dcb5add257e3d4df7a069cd865 100644
--- a/content/shell/browser/shell.cc
+++ b/content/shell/browser/shell.cc
@@ -179,6 +179,17 @@ void Shell::LoadURLForFrame(const GURL& url, const std::string& frame_name) {
   web_contents_->GetView()->Focus();
 }
 
+void Shell::LoadDataWithBaseURL(const GURL& base_url, const std::string& data,

[darin (slow to review), 2014/03/27 08:10:28]

nit: since this method is named LoadDataWithBaseURL, it might be helpful to list
the base_url parameter after the data to better match the order in which those
items are mentioned in the method name.

Also, since history_url is sort of similar to the url parameter to
LoadURLForFrame, you might consider listing it first and just call it |url|.

void Shell::LoadDataWithBaseURL(const GURL& url, const std::string& data, const
GURL& base_url);

[hush (inactive), 2014/03/27 20:15:00]

Done.

+    const GURL& history_url) {
+  const GURL url = GURL("data:text/html;charset=utf-8," + data);
+  NavigationController::LoadURLParams params(url);
+  params.load_type = NavigationController::LOAD_TYPE_DATA;
+  params.base_url_for_data_url = base_url;
+  params.virtual_url_for_data_url = history_url;
+  params.override_user_agent = NavigationController::UA_OVERRIDE_FALSE;
+  web_contents_->GetController().LoadURLWithParams(params);
+  web_contents_->GetView()->Focus();
+}

[darin (slow to review), 2014/03/27 08:10:28]

nit: add a new line below here.

[hush (inactive), 2014/03/27 20:15:00]

Done.

 void Shell::AddNewContents(WebContents* source,
                            WebContents* new_contents,
                            WindowOpenDisposition disposition,