Remove SW rendering path code from BrowserPlugin.

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 990b21cc6a63fead6018cc40f7b71bed6ac6a93a..3bc074c6abeb5d177ad919dc79dea5854cd9e3fd 100644
--- a/content/browser/browser_plugin/test_browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/test_browser_plugin_guest.cc
@@ -18,18 +18,14 @@ TestBrowserPluginGuest::TestBrowserPluginGuest(
     WebContentsImpl* web_contents)
     : BrowserPluginGuest(instance_id, false, web_contents, NULL),
       update_rect_count_(0),
-      damage_buffer_call_count_(0),
       exit_observed_(false),
       focus_observed_(false),
       blur_observed_(false),
       advance_focus_observed_(false),
       was_hidden_observed_(false),
-      set_damage_buffer_observed_(false),
       input_observed_(false),
       load_stop_observed_(false),
-      ime_cancel_observed_(false),
-      waiting_for_damage_buffer_with_size_(false),
-      last_damage_buffer_size_(gfx::Size()) {
+      ime_cancel_observed_(false) {
 }
 
 TestBrowserPluginGuest::~TestBrowserPluginGuest() {
@@ -69,17 +65,6 @@ void TestBrowserPluginGuest::ResetUpdateRectCount() {
   update_rect_count_ = 0;
 }
 
-void TestBrowserPluginGuest::WaitForDamageBufferWithSize(
-    const gfx::Size& size) {
-  if (damage_buffer_call_count_ > 0 && last_damage_buffer_size_ == size)
-    return;
-
-  expected_damage_buffer_size_ = size;
-  waiting_for_damage_buffer_with_size_ = true;
-  damage_buffer_message_loop_runner_ = new MessageLoopRunner();
-  damage_buffer_message_loop_runner_->Run();
-}
-
 void TestBrowserPluginGuest::RenderProcessGone(base::TerminationStatus status) {
   exit_observed_ = true;
   if (status != base::TERMINATION_STATUS_NORMAL_TERMINATION &&
@@ -193,6 +178,18 @@ void TestBrowserPluginGuest::WaitForImeCancel() {
   ime_cancel_observed_ = false;
 }
 
+void TestBrowserPluginGuest::WaitForResizeGuest(const gfx::Size& view_size) {
+  if (last_size_observed_in_resize_ == view_size) {
+    last_size_observed_in_resize_ = gfx::Size();
+    return;
+  }
+
+  expected_view_size_in_resize_ = view_size;
+  resize_guest_message_loop_runner_ = new MessageLoopRunner();
+  resize_guest_message_loop_runner_->Run();
+  last_size_observed_in_resize_ = gfx::Size();
+}
+
 void TestBrowserPluginGuest::OnSetFocus(int instance_id, bool focused) {
   if (focused) {
     focus_observed_ = true;
@@ -213,21 +210,6 @@ void TestBrowserPluginGuest::OnTakeFocus(bool reverse) {
   BrowserPluginGuest::OnTakeFocus(reverse);
 }
 
-void TestBrowserPluginGuest::SetDamageBuffer(
-    const BrowserPluginHostMsg_ResizeGuest_Params& params) {
-  ++damage_buffer_call_count_;
-  last_damage_buffer_size_ = params.view_rect.size();
-
-  if (waiting_for_damage_buffer_with_size_ &&
-      expected_damage_buffer_size_ == params.view_rect.size() &&
-      damage_buffer_message_loop_runner_) {
-    damage_buffer_message_loop_runner_->Quit();
-    waiting_for_damage_buffer_with_size_ = false;
-  }
-
-  BrowserPluginGuest::SetDamageBuffer(params);
-}
-
 void TestBrowserPluginGuest::DidStopLoading(
     RenderViewHost* render_view_host) {
   BrowserPluginGuest::DidStopLoading(render_view_host);
@@ -245,6 +227,18 @@ void TestBrowserPluginGuest::OnImeCancelComposition() {
   BrowserPluginGuest::OnImeCancelComposition();
 }
 
+void TestBrowserPluginGuest::OnResizeGuest(
+    int instance_id,
+    const BrowserPluginHostMsg_ResizeGuest_Params& params) {
+  last_size_observed_in_resize_ = params.view_rect.size();
+  if (last_size_observed_in_resize_ == expected_view_size_in_resize_ &&
+      resize_guest_message_loop_runner_) {
+    resize_guest_message_loop_runner_->Quit();
+  }
+
+  BrowserPluginGuest::OnResizeGuest(instance_id, params);
+}
+
 void TestBrowserPluginGuest::WasHidden() {
   was_hidden_observed_ = true;
   if (was_hidden_message_loop_runner_)