Move ExtraData from WebRequest to WebDataSource....

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "v8_proxy.h"
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
@@ skipping 492 matching lines @@
       cache_policy = WebRequestUseProtocolCachePolicy;
     }
 
     scoped_ptr<WebRequest> request(WebRequest::Create(entry.GetURL()));
     request->SetCachePolicy(cache_policy);
     // If we are reloading, then WebKit will use the state of the current page.
     // Otherwise, we give it the state to navigate to.
     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();
     if (!entry.GetTargetFrame().empty())
         frame = webView()->GetFrameWithName(entry.GetTargetFrame());
     // TODO(mpcomplete): should we clear the target frame, or should
     // 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
     // LoadRequest, thus making some tests fail (see http://b/issue?id=845337
     // for more details).
     webView()->SetFocusedFrame(frame);
     SetFocus(webViewHost(), true);
 
     return true;
 }
@@ skipping 108 matching lines @@
   }
 #endif  // OS_WIN
   return false;
 }
 
 std::wstring GetWebKitLocale() {
   return L"en-US";
 }
 
 }  // namespace webkit_glue