BrowserPluginHostTest: Rewrite 3 focus related tests and 1 visibility test to browser_tests.

content/browser/browser_plugin/test_browser_plugin_guest.cc

Index: content/browser/browser_plugin/test_browser_plugin_guest.cc
diff --git a/content/browser/browser_plugin/test_browser_plugin_guest.cc b/content/browser/browser_plugin/test_browser_plugin_guest.cc
index ed6586242a4d1dda04fd42b9330bf4f7418ba8d6..f4b124c9cddc77e6e4815eca52c918195a310374 100644
--- a/content/browser/browser_plugin/test_browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/test_browser_plugin_guest.cc
@@ -17,9 +17,6 @@ TestBrowserPluginGuest::TestBrowserPluginGuest(
     WebContentsImpl* web_contents)
     : BrowserPluginGuest(instance_id, false, web_contents),
       update_rect_count_(0),
-      focus_observed_(false),
-      blur_observed_(false),
-      advance_focus_observed_(false),
       input_observed_(false),
       load_stop_observed_(false),
       ime_cancel_observed_(false) {
@@ -38,12 +35,6 @@ void TestBrowserPluginGuest::SendMessageToEmbedder(IPC::Message* msg) {
     BrowserPluginMsg_UpdateRect::Param param;
     BrowserPluginMsg_UpdateRect::Read(msg, &param);
     BrowserPluginMsg_UpdateRect_Params params = param.b;
-    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();
   }
@@ -58,10 +49,6 @@ void TestBrowserPluginGuest::WaitForUpdateRectMsg() {
   send_message_loop_runner_->Run();
 }
 
-void TestBrowserPluginGuest::ResetUpdateRectCount() {
-  update_rect_count_ = 0;
-}
-
 void TestBrowserPluginGuest::OnHandleInputEvent(
     int instance_id,
     const gfx::Rect& guest_window_rect,
@@ -74,33 +61,6 @@ void TestBrowserPluginGuest::OnHandleInputEvent(
     input_message_loop_runner_->Quit();
 }
 
-void TestBrowserPluginGuest::WaitForFocus() {
-  if (focus_observed_) {
-    focus_observed_ = false;
-    return;
-  }
-  focus_message_loop_runner_ = new MessageLoopRunner();
-  focus_message_loop_runner_->Run();
-  focus_observed_ = false;
-}
-
-void TestBrowserPluginGuest::WaitForBlur() {
-  if (blur_observed_) {
-    blur_observed_ = false;
-    return;
-  }
-  blur_message_loop_runner_ = new MessageLoopRunner();
-  blur_message_loop_runner_->Run();
-  blur_observed_ = false;
-}
-
-void TestBrowserPluginGuest::WaitForAdvanceFocus() {
-  if (advance_focus_observed_)
-    return;
-  advance_focus_message_loop_runner_ = new MessageLoopRunner();
-  advance_focus_message_loop_runner_->Run();
-}
-
 void TestBrowserPluginGuest::WaitForInput() {
   if (input_observed_) {
     input_observed_ = false;
@@ -123,18 +83,6 @@ void TestBrowserPluginGuest::WaitForLoadStop() {
   load_stop_observed_ = false;
 }
 
-void TestBrowserPluginGuest::WaitForViewSize(const gfx::Size& view_size) {
-  if (last_view_size_observed_ == view_size) {
-    last_view_size_observed_ = gfx::Size();
-    return;
-  }
-
-  expected_auto_view_size_ = view_size;
-  auto_view_size_message_loop_runner_ = new MessageLoopRunner();
-  auto_view_size_message_loop_runner_->Run();
-  last_view_size_observed_ = gfx::Size();
-}
-
 void TestBrowserPluginGuest::WaitForImeCancel() {
   if (ime_cancel_observed_) {
     ime_cancel_observed_ = false;
@@ -146,26 +94,6 @@ void TestBrowserPluginGuest::WaitForImeCancel() {
   ime_cancel_observed_ = false;
 }
 
-void TestBrowserPluginGuest::OnSetFocus(int instance_id, bool focused) {
-  if (focused) {
-    focus_observed_ = true;
-    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::OnSetFocus(instance_id, focused);
-}
-
-void TestBrowserPluginGuest::OnTakeFocus(bool reverse) {
-  advance_focus_observed_ = true;
-  if (advance_focus_message_loop_runner_)
-    advance_focus_message_loop_runner_->Quit();
-  BrowserPluginGuest::OnTakeFocus(reverse);
-}
-
 void TestBrowserPluginGuest::DidStopLoading(
     RenderViewHost* render_view_host) {
   BrowserPluginGuest::DidStopLoading(render_view_host);