Browser Plugin: Simplify BrowserPluginGuestHelper

content/browser/browser_plugin/test_browser_plugin_guest.cc

 // Copyright (c) 2012 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 "content/browser/browser_plugin/test_browser_plugin_guest.h"
 
 #include "base/test/test_timeouts.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/browser_plugin_messages.h"
@@ skipping 52 matching lines @@
     }
   }
 
   BrowserPluginGuest::Observe(type, source, details);
 }
 
 void TestBrowserPluginGuest::SendMessageToEmbedder(IPC::Message* msg) {
   if (msg->type() == BrowserPluginMsg_UpdateRect::ID) {
     update_rect_count_++;
     int instance_id = 0;
-    int message_id = 0;
     BrowserPluginMsg_UpdateRect_Params params;
-    BrowserPluginMsg_UpdateRect::Read(msg, &instance_id, &message_id, &params);
+    BrowserPluginMsg_UpdateRect::Read(msg, &instance_id, &params);
     last_view_size_observed_ = params.view_size;
     if (!expected_auto_view_size_.IsEmpty() &&
         expected_auto_view_size_ == params.view_size) {
       if (auto_view_size_message_loop_runner_)
         auto_view_size_message_loop_runner_->Quit();
     }
     if (send_message_loop_runner_)
       send_message_loop_runner_->Quit();
   }
   BrowserPluginGuest::SendMessageToEmbedder(msg);
@@ skipping 152 matching lines @@
     if (focus_message_loop_runner_)
       focus_message_loop_runner_->Quit();
   } else {
     blur_observed_ = true;
     if (blur_message_loop_runner_)
       blur_message_loop_runner_->Quit();
   }
   BrowserPluginGuest::SetFocus(focused);
 }
 
-bool TestBrowserPluginGuest::ViewTakeFocus(bool reverse) {
+void TestBrowserPluginGuest::OnTakeFocus(bool reverse) {
   advance_focus_observed_ = true;
   if (advance_focus_message_loop_runner_)
     advance_focus_message_loop_runner_->Quit();
-  return BrowserPluginGuest::ViewTakeFocus(reverse);
+  BrowserPluginGuest::OnTakeFocus(reverse);
 }
 
 void TestBrowserPluginGuest::Reload() {
   reload_observed_ = true;
   if (reload_message_loop_runner_)
     reload_message_loop_runner_->Quit();
   BrowserPluginGuest::Reload();
 }
 
 void TestBrowserPluginGuest::Stop() {
@@ skipping 33 matching lines @@
 
 void TestBrowserPluginGuest::DidStopLoading(
     RenderViewHost* render_view_host) {
   BrowserPluginGuest::DidStopLoading(render_view_host);
   load_stop_observed_ = true;
   if (load_stop_message_loop_runner_)
     load_stop_message_loop_runner_->Quit();
 }
 
 }  // namespace content