Most visited iframe now postMessage to signal the iframing page that the link has been displayed

chrome/browser/search/iframe_source_unittest.cc

 // Copyright 2013 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 "chrome/browser/search/iframe_source.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 33 matching lines @@
     return path == "/valid.html" || path == "/valid.js";
   }
 
   virtual void StartDataRequest(
       const std::string& path,
       int render_process_id,
       int render_frame_id,
       const content::URLDataSource::GotDataCallback& callback) OVERRIDE {
   }
 
-  // RenderViewHost is hard to mock in concert with everything else, so stub
+  // RenderFrameHost is hard to mock in concert with everything else, so stub
   // this method out for testing.
   virtual bool GetOrigin(
       int process_id,
-      int render_view_id,
+      int render_frame_id,
       std::string* origin) const OVERRIDE {
     if (process_id == kInstantRendererPID) {
       *origin = kInstantOrigin;
       return true;
     }
     if (process_id == kNonInstantRendererPID) {
       *origin = kNonInstantOrigin;
       return true;
     }
     return false;
@@ skipping 20 matching lines @@
       return std::string(reinterpret_cast<const char*>(response_->front()),
                          response_->size());
     }
     return "";
   }
 
   net::URLRequest* MockRequest(
       const std::string& url,
       bool allocate_info,
       int render_process_id,
-      int render_view_id) {
+      int render_frame_id) {
     net::URLRequest* request =
         new net::URLRequest(GURL(url),
                             net::DEFAULT_PRIORITY,
                             NULL,
                             resource_context_.GetRequestContext());
     if (allocate_info) {
       content::ResourceRequestInfo::AllocateForTesting(request,
                                                        ResourceType::SUB_FRAME,
                                                        &resource_context_,
                                                        render_process_id,
-                                                       render_view_id,
+                                                       render_frame_id,
                                                        MSG_ROUTING_NONE,
                                                        false);
     }
     return request;
   }
 
   void SendResource(int resource_id) {
     source()->SendResource(resource_id, callback_);
   }
 
   void SendJSWithOrigin(
       int resource_id,
       int render_process_id,
-      int render_view_id) {
-    source()->SendJSWithOrigin(resource_id, render_process_id, render_view_id,
+      int render_frame_id) {
+    source()->SendJSWithOrigin(resource_id, render_process_id, render_frame_id,
                                callback_);
   }
 
  private:
   virtual void SetUp() OVERRIDE {
     source_.reset(new TestIframeSource());
     callback_ = base::Bind(&IframeSourceTest::SaveResponse,
                            base::Unretained(this));
     instant_io_context_ = new InstantIOContext;
     InstantIOContext::SetUserDataOnIO(&resource_context_, instant_io_context_);
@@ skipping 57 matching lines @@
 }
 
 TEST_F(IframeSourceTest, SendJSWithOrigin) {
   SendJSWithOrigin(IDR_MOST_VISITED_TITLE_JS, kInstantRendererPID, 0);
   EXPECT_FALSE(response_string().empty());
   SendJSWithOrigin(IDR_MOST_VISITED_TITLE_JS, kNonInstantRendererPID, 0);
   EXPECT_FALSE(response_string().empty());
   SendJSWithOrigin(IDR_MOST_VISITED_TITLE_JS, kInvalidRendererPID, 0);
   EXPECT_TRUE(response_string().empty());
 }