Apply merge from @fsamuel.

content/renderer/browser_plugin/browser_plugin_browsertest.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/renderer/browser_plugin/browser_plugin_browsertest.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/singleton.h"
 #include "base/path_service.h"
@@ skipping 126 matching lines @@
     BrowserPluginHostMsg_ResizeGuest::Read(msg, &instance_id, &params);
     EXPECT_EQ(640, params.view_size.width());
     EXPECT_EQ(480, params.view_size.height());
   }
 
   MockBrowserPlugin* browser_plugin =
       static_cast<MockBrowserPlugin*>(
           browser_plugin_manager()->GetBrowserPlugin(instance_id));
   ASSERT_TRUE(browser_plugin);
   // Now the browser plugin is expecting a UpdateRect resize.
-  EXPECT_TRUE(browser_plugin->pending_damage_buffer_);
+  EXPECT_TRUE(browser_plugin->pending_damage_buffer_.get());
 
   // Send the BrowserPlugin an UpdateRect equal to its container size with
   // the same damage buffer. That should clear |pending_damage_buffer_|.
   BrowserPluginMsg_UpdateRect_Params update_rect_params;
-  update_rect_params.damage_buffer_identifier =
-#if defined(OS_MACOSX)
-        browser_plugin->pending_damage_buffer_->id();
-#else
-        browser_plugin->pending_damage_buffer_->handle();
-#endif
+  update_rect_params.damage_buffer_sequence_id =
+      browser_plugin->damage_buffer_sequence_id_;
   update_rect_params.view_size = gfx::Size(640, 480);
   update_rect_params.scale_factor = 1.0f;
   update_rect_params.is_resize_ack = true;
   BrowserPluginMsg_UpdateRect msg(0, instance_id, 0, update_rect_params);
   browser_plugin->OnMessageReceived(msg);
-  EXPECT_FALSE(browser_plugin->pending_damage_buffer_);
+  EXPECT_FALSE(browser_plugin->pending_damage_buffer_.get());
 }
 
 // Verify that the src attribute on the browser plugin works as expected.
 TEST_F(BrowserPluginTest, SrcAttribute) {
   LoadHTML(GetHTMLForBrowserPluginObject().c_str());
   // Verify that we're reporting the correct URL to navigate to based on the
   // src attribute.
   {
     // Ensure we get a CreateGuest on the initial navigation.
     const IPC::Message* create_msg =
@@ skipping 50 matching lines @@
     const IPC::Message* nav_msg =
     browser_plugin_manager()->sink().GetUniqueMessageMatching(
         BrowserPluginHostMsg_NavigateGuest::ID);
     ASSERT_TRUE(nav_msg);
     BrowserPluginHostMsg_NavigateGuest::Read(nav_msg, &instance_id, &src);
   }
   MockBrowserPlugin* browser_plugin =
       static_cast<MockBrowserPlugin*>(
           browser_plugin_manager()->GetBrowserPlugin(instance_id));
   ASSERT_TRUE(browser_plugin);
-  EXPECT_TRUE(browser_plugin->pending_damage_buffer_);
+  EXPECT_TRUE(browser_plugin->pending_damage_buffer_.get());
   // Send an UpdateRect to the BrowserPlugin to make it use the pending damage
   // buffer.
   {
     // We send a stale UpdateRect to the BrowserPlugin.
     BrowserPluginMsg_UpdateRect_Params update_rect_params;
     update_rect_params.view_size = gfx::Size(640, 480);
     update_rect_params.scale_factor = 1.0f;
     update_rect_params.is_resize_ack = true;
-    // By sending the damage buffer handle back to BrowserPlugin on UpdateRect,
-    // then the BrowserPlugin knows that the browser process has received and
-    // has begun to use the pending_damage_buffer.
-    update_rect_params.damage_buffer_identifier =
-#if defined(OS_MACOSX)
-        browser_plugin->pending_damage_buffer_->id();
-#else
-        browser_plugin->pending_damage_buffer_->handle();
-#endif
+    // By sending |damage_buffer_sequence_id| back to BrowserPlugin on
+    // UpdateRect, then the BrowserPlugin knows that the browser process has
+    // received and has begun to use the |pending_damage_buffer_|.
+    update_rect_params.damage_buffer_sequence_id =
+        browser_plugin->damage_buffer_sequence_id_;
     BrowserPluginMsg_UpdateRect msg(0, instance_id, 0, update_rect_params);
     browser_plugin->OnMessageReceived(msg);
-    EXPECT_EQ(NULL, browser_plugin->pending_damage_buffer_);
+    EXPECT_EQ(NULL, browser_plugin->pending_damage_buffer_.get());
   }
 
   browser_plugin_manager()->sink().ClearMessages();
 
   // Resize the browser plugin three times.
   ExecuteJavaScript("document.getElementById('browserplugin').width = '641px'");
   ProcessPendingMessages();
   ExecuteJavaScript("document.getElementById('browserplugin').width = '642px'");
   ProcessPendingMessages();
   ExecuteJavaScript("document.getElementById('browserplugin').width = '643px'");
   ProcessPendingMessages();
 
   // Expect to see one messsage in the sink. BrowserPlugin will not issue
   // subsequent resize requests until the first request is satisfied by the
   // guest.
   EXPECT_EQ(1u, browser_plugin_manager()->sink().message_count());
   const IPC::Message* msg =
       browser_plugin_manager()->sink().GetFirstMessageMatching(
           BrowserPluginHostMsg_ResizeGuest::ID);
   ASSERT_TRUE(msg);
   BrowserPluginHostMsg_ResizeGuest_Params params;
   BrowserPluginHostMsg_ResizeGuest::Read(msg, &instance_id, &params);
   EXPECT_EQ(641, params.view_size.width());
   EXPECT_EQ(480, params.view_size.height());
   // This indicates that the BrowserPlugin has sent out a previous resize
   // request but has not yet received an UpdateRect for that request.
-  EXPECT_TRUE(browser_plugin->pending_damage_buffer_);
+  EXPECT_TRUE(browser_plugin->pending_damage_buffer_.get());
 
   {
     // We send a stale UpdateRect to the BrowserPlugin.
     BrowserPluginMsg_UpdateRect_Params update_rect_params;
     update_rect_params.view_size = gfx::Size(641, 480);
     update_rect_params.scale_factor = 1.0f;
     update_rect_params.is_resize_ack = true;
-    update_rect_params.damage_buffer_identifier =
-#if defined(OS_MACOSX)
-        browser_plugin->pending_damage_buffer_->id();
-#else
-        browser_plugin->pending_damage_buffer_->handle();
-#endif
+    update_rect_params.damage_buffer_sequence_id =
+        browser_plugin->damage_buffer_sequence_id_;
     BrowserPluginMsg_UpdateRect msg(0, instance_id, 0, update_rect_params);
     browser_plugin->OnMessageReceived(msg);
     // This tells us that the BrowserPlugin is still expecting another
     // UpdateRect with the most recent size.
-    EXPECT_TRUE(browser_plugin->pending_damage_buffer_);
+    EXPECT_TRUE(browser_plugin->pending_damage_buffer_.get());
   }
   // Send the BrowserPlugin another UpdateRect, but this time with a size
   // that matches the size of the container.
   {
     BrowserPluginMsg_UpdateRect_Params update_rect_params;
     update_rect_params.view_size = gfx::Size(643, 480);
     update_rect_params.scale_factor = 1.0f;
     update_rect_params.is_resize_ack = true;
-    update_rect_params.damage_buffer_identifier =
-#if defined(OS_MACOSX)
-        browser_plugin->pending_damage_buffer_->id();
-#else
-        browser_plugin->pending_damage_buffer_->handle();
-#endif
+    update_rect_params.damage_buffer_sequence_id =
+        browser_plugin->damage_buffer_sequence_id_;
     BrowserPluginMsg_UpdateRect msg(0, instance_id, 0, update_rect_params);
     browser_plugin->OnMessageReceived(msg);
     // The BrowserPlugin has finally received an UpdateRect that satisifes
     // its current size, and so it is happy.
-    EXPECT_FALSE(browser_plugin->pending_damage_buffer_);
+    EXPECT_FALSE(browser_plugin->pending_damage_buffer_.get());
   }
 }
 
 TEST_F(BrowserPluginTest, GuestCrash) {
   LoadHTML(GetHTMLForBrowserPluginObject().c_str());
 
   // Grab the BrowserPlugin's instance ID from its resize message.
   int instance_id = 0;
   {
     const IPC::Message* msg =
@@ skipping 475 matching lines @@
      EXPECT_EQ(42, params.auto_size_params.min_size.width());
      EXPECT_EQ(43, params.auto_size_params.min_size.height());
      EXPECT_EQ(1337, params.auto_size_params.max_size.width());
      EXPECT_EQ(1338, params.auto_size_params.max_size.height());
   }
   // Verify that we are waiting for the browser process to grab the new
   // damage buffer.
   MockBrowserPlugin* browser_plugin =
       static_cast<MockBrowserPlugin*>(
           browser_plugin_manager()->GetBrowserPlugin(instance_id));
-  EXPECT_TRUE(browser_plugin->pending_damage_buffer_);
+  EXPECT_TRUE(browser_plugin->pending_damage_buffer_.get());
   // Disable autosize. AutoSize state will not be sent to the guest until
   // the guest has responded to the last resize request.
   ExecuteJavaScript(kDisableAutoSize);
   ProcessPendingMessages();
 
   const IPC::Message* auto_size_msg =
   browser_plugin_manager()->sink().GetUniqueMessageMatching(
       BrowserPluginHostMsg_SetAutoSize::ID);
   EXPECT_FALSE(auto_size_msg);
 
   // Send the BrowserPlugin an UpdateRect equal to its |max_size| with
   // the same damage buffer.
   BrowserPluginMsg_UpdateRect_Params update_rect_params;
-  update_rect_params.damage_buffer_identifier =
-#if defined(OS_MACOSX)
-        browser_plugin->pending_damage_buffer_->id();
-#else
-        browser_plugin->pending_damage_buffer_->handle();
-#endif
+  update_rect_params.damage_buffer_sequence_id =
+      browser_plugin->damage_buffer_sequence_id_;
   update_rect_params.view_size = gfx::Size(1337, 1338);
   update_rect_params.scale_factor = 1.0f;
   update_rect_params.is_resize_ack = true;
   BrowserPluginMsg_UpdateRect msg(0, instance_id, 0, update_rect_params);
   browser_plugin->OnMessageReceived(msg);
 
   // Verify that the autosize state has been updated.
   {
     const IPC::Message* auto_size_msg =
     browser_plugin_manager()->sink().GetUniqueMessageMatching(
@@ skipping 11 matching lines @@
                                               &resize_params);
     EXPECT_FALSE(auto_size_params.enable);
     EXPECT_EQ(42, auto_size_params.min_size.width());
     EXPECT_EQ(43, auto_size_params.min_size.height());
     EXPECT_EQ(1337, auto_size_params.max_size.width());
     EXPECT_EQ(1338, auto_size_params.max_size.height());
   }
 }
 
 }  // namespace content