base::Bind: Cleanup in test_shell.

webkit/tools/test_shell/webwidget_host.h

 // Copyright (c) 2011 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.
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_WEBWIDGET_HOST_H_
 #define WEBKIT_TOOLS_TEST_SHELL_WEBWIDGET_HOST_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "base/task.h"
 #include "skia/ext/platform_canvas.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 
 namespace gfx {
 class Size;
 }
 
 namespace WebKit {
@@ skipping 126 matching lines @@
   // Since GtkWindow resize is asynchronous, we have to stash the dimensions,
   // so that the backing store doesn't have to wait for sizing to take place.
   gfx::Size logical_size_;
 #endif
 
 #ifndef NDEBUG
   bool painting_;
 #endif
 
  private:
-  ScopedRunnableMethodFactory<WebWidgetHost> factory_;
+  base::WeakPtrFactory<WebWidgetHost> weak_factory_;
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_WEBWIDGET_HOST_H_