Move ExtraData from WebRequest to WebDataSource....

webkit/tools/test_shell/test_shell.cc

Index: webkit/tools/test_shell/test_shell.cc
===================================================================
--- webkit/tools/test_shell/test_shell.cc	(revision 16382)
+++ webkit/tools/test_shell/test_shell.cc	(working copy)
@@ -510,8 +510,13 @@
     if (!reload)
       request->SetHistoryState(entry.GetContentState());
 
-    request->SetExtraData(
-        new TestShellExtraRequestData(entry.GetPageID()));
+    // A navigation resulting from loading a javascript URL should not be
+    // treated as a browser initiated event.  Instead, we want it to look as if
+    // the page initiated any load resulting from JS execution.
+    if (!entry.GetURL().SchemeIs("javascript")) {
+      delegate_->set_pending_extra_data(
+          new TestShellExtraData(entry.GetPageID()));
+    }
 
     // Get the right target frame for the entry.
     WebFrame* frame = webView()->GetMainFrame();
@@ -521,6 +526,10 @@
     // back/forward navigations maintain the target frame?
 
     frame->LoadRequest(request.get());
+
+    // In case LoadRequest failed before DidCreateDataSource was called.
+    delegate_->set_pending_extra_data(NULL);
+
     // Restore focus to the main frame prior to loading new request.
     // This makes sure that we don't have a focused iframe. Otherwise, that
     // iframe would keep focus when the SetFocus called immediately after