Let PaintAtAck send an int tag instead of the TransportDIB handle.

chrome/browser/renderer_host/render_widget_host_unittest.cc

 // Copyright (c) 2009 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 "base/basictypes.h"
 #include "base/keyboard_codes.h"
 #include "base/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "base/timer.h"
 #include "build/build_config.h"
@@ skipping 186 matching lines @@
 };
 
 // MockPaintingObserver --------------------------------------------------------
 
 class MockPaintingObserver : public RenderWidgetHostPaintingObserver {
  public:
   void WidgetWillDestroyBackingStore(RenderWidgetHost* widget,
                                      BackingStore* backing_store) {}
   void WidgetDidUpdateBackingStore(RenderWidgetHost* widget) {}
   void WidgetDidReceivePaintAtSizeAck(RenderWidgetHost* host,
-                                      const TransportDIB::Handle& dib_handle,
+                                      int tag,
                                       const gfx::Size& size) {
     host_ = reinterpret_cast<MockRenderWidgetHost*>(host);
-    dib_handle_ = dib_handle;
+    tag_ = tag;
     size_ = size;
   }
 
   MockRenderWidgetHost* host() const { return host_; }
-  TransportDIB::Handle dib_handle() const { return dib_handle_; }
+  int tag() const { return tag_; }
   gfx::Size size() const { return size_; }
 
  private:
   MockRenderWidgetHost* host_;
-  TransportDIB::Handle dib_handle_;
+  int tag_;
   gfx::Size size_;
 };
 
 
 // RenderWidgetHostTest --------------------------------------------------------
 
 class RenderWidgetHostTest : public testing::Test {
  public:
   RenderWidgetHostTest() : process_(NULL) {
   }
@@ skipping 298 matching lines @@
   // It should have sent out a restored message with a request to paint.
   const IPC::Message* restored = process_->sink().GetUniqueMessageMatching(
       ViewMsg_WasRestored::ID);
   ASSERT_TRUE(restored);
   Tuple1<bool> needs_repaint;
   ViewMsg_WasRestored::Read(restored, &needs_repaint);
   EXPECT_TRUE(needs_repaint.a);
 }
 
 TEST_F(RenderWidgetHostTest, PaintAtSize) {
-  host_->PaintAtSize(TransportDIB::GetFakeHandleForTest(), gfx::Size(40, 60),
-                     gfx::Size(20, 30));
+  const int kPaintAtSizeTag = 42;
+  host_->PaintAtSize(TransportDIB::GetFakeHandleForTest(), kPaintAtSizeTag,
+                     gfx::Size(40, 60), gfx::Size(20, 30));
   EXPECT_TRUE(
       process_->sink().GetUniqueMessageMatching(ViewMsg_PaintAtSize::ID));
 
   MockPaintingObserver observer;
   host_->set_painting_observer(&observer);
 
-  // Need to generate a fake handle value on all platforms.
-  TransportDIB::Handle handle = TransportDIB::GetFakeHandleForTest();
-  host_->OnMsgPaintAtSizeAck(handle, gfx::Size(20, 30));
-  EXPECT_TRUE(host_ == observer.host());
-  EXPECT_TRUE(handle == observer.dib_handle());
+  host_->OnMsgPaintAtSizeAck(kPaintAtSizeTag, gfx::Size(20, 30));
+  EXPECT_EQ(host_.get(), observer.host());
+  EXPECT_EQ(kPaintAtSizeTag, observer.tag());
   EXPECT_EQ(20, observer.size().width());
   EXPECT_EQ(30, observer.size().height());
   host_->set_painting_observer(NULL);
 }
 
 TEST_F(RenderWidgetHostTest, HandleKeyEventsWeSent) {
   // Simulate a keyboard event.
   SimulateKeyboardEvent(WebInputEvent::RawKeyDown);
 
   // Make sure we sent the input event to the renderer.
@@ skipping 136 matching lines @@
   // Start it again to ensure it still works.
   EXPECT_FALSE(host_->unresponsive_timer_fired());
   host_->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(10));
 
   // Wait long enough for first timeout and see if it fired.
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
                                           new MessageLoop::QuitTask(), 10);
   MessageLoop::current()->Run();
   EXPECT_TRUE(host_->unresponsive_timer_fired());
 }