Plumb initiator out of Blink.

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 7401 matching lines @@
           FrameLoadTypeBackForward, item.get(), HistorySameDocumentLoad);
   EXPECT_EQ(WebBackForwardCommit, client.lastCommitType());
 }
 
 class TestHistoryWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
  public:
   TestHistoryWebFrameClient() {
     m_replacesCurrentHistoryItem = false;
   }
 
-  void didStartProvisionalLoad(WebDataSource* dataSource,
+  void didStartProvisionalLoad(WebLocalFrame* initiatorFrame,
+                               WebDataSource* dataSource,
                                WebURLRequest& request) {
     m_replacesCurrentHistoryItem = dataSource->replacesCurrentHistoryItem();
   }
 
   bool replacesCurrentHistoryItem() { return m_replacesCurrentHistoryItem; }
 
  private:
   bool m_replacesCurrentHistoryItem;
 };
 
@@ skipping 1714 matching lines @@
 
   // Manually reset to break WebViewHelper's dependency on the stack allocated
   // TestWebFrameClient.
   reset();
   remoteFrame->close();
 }
 
 class RemoteNavigationClient
     : public FrameTestHelpers::TestWebRemoteFrameClient {
  public:
-  void navigate(const WebURLRequest& request,
+  void navigate(WebLocalFrame* initiatorFrame,
+                const WebURLRequest& request,
                 bool shouldReplaceCurrentEntry) override {
     m_lastRequest = request;
   }
 
   const WebURLRequest& lastRequest() const { return m_lastRequest; }
 
  private:
   WebURLRequest m_lastRequest;
 };
 
@@ skipping 954 matching lines @@
 
 class CallbackOrderingWebFrameClient
     : public FrameTestHelpers::TestWebFrameClient {
  public:
   CallbackOrderingWebFrameClient() : m_callbackCount(0) {}
 
   void didStartLoading(bool toDifferentDocument) override {
     EXPECT_EQ(0, m_callbackCount++);
     FrameTestHelpers::TestWebFrameClient::didStartLoading(toDifferentDocument);
   }
-  void didStartProvisionalLoad(WebDataSource*, WebURLRequest&) override {
+  void didStartProvisionalLoad(WebLocalFrame* initiatorFrame,
+                               WebDataSource*,
+                               WebURLRequest&) override {
     EXPECT_EQ(1, m_callbackCount++);
   }
   void didCommitProvisionalLoad(WebLocalFrame*,
                                 const WebHistoryItem&,
                                 WebHistoryCommitType) override {
     EXPECT_EQ(2, m_callbackCount++);
   }
   void didFinishDocumentLoad(WebLocalFrame*) override {
     EXPECT_EQ(3, m_callbackCount++);
   }
@@ skipping 1356 matching lines @@
   EXPECT_FALSE(testSelectAll("<textarea></textarea>"));
   EXPECT_TRUE(testSelectAll("<textarea>nonempty</textarea>"));
   EXPECT_FALSE(testSelectAll("<input>"));
   EXPECT_TRUE(testSelectAll("<input value='nonempty'>"));
   // TODO(amaralp): Empty contenteditable should not have select all enabled.
   EXPECT_TRUE(testSelectAll("<div contenteditable></div>"));
   EXPECT_TRUE(testSelectAll("<div contenteditable>nonempty</div>"));
 }
 
 }  // namespace blink