base::Bind: Cleanup in test_shell.

webkit/tools/test_shell/layout_test_controller.h

 // Copyright (c) 2010 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.
 
 /*
   LayoutTestController class:
   Bound to a JavaScript window.layoutTestController object using the
   CppBoundClass::BindToJavascript(), this allows layout tests that are run in
   the test_shell (or, in principle, any web page loaded into a client app built
   with this class) to control various aspects of how the tests are run and what
   sort of output they produce.
 */
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_LAYOUT_TEST_CONTROLLER_H_
 #define WEBKIT_TOOLS_TEST_SHELL_LAYOUT_TEST_CONTROLLER_H_
 
 #include <queue>
 
+#include "base/memory/weak_ptr.h"
 #include "base/timer.h"
 #include "base/string16.h"
 #include "webkit/glue/cpp_bound_class.h"
 
 class TestShell;
 
 class LayoutTestController : public CppBoundClass {
  public:
   // Builds the property and method lists needed to bind this class to a JS
   // object.
@@ skipping 72 matching lines @@
   };
 
   void notifyDoneTimedOut();
 
   void LogErrorToConsole(const std::string& text);
 
   void completeNotifyDone(bool is_timeout);
 
   // Used for test timeouts.
   // TODO(ojan): Use base::OneShotTimer.
-  ScopedRunnableMethodFactory<LayoutTestController> timeout_factory_;
+  base::WeakPtrFactory<LayoutTestController> weak_factory_;
 
   // Non-owning pointer.  The LayoutTestController is owned by the host.
   static TestShell* shell_;
 
   // If true, the element will be treated as editable.  This value is returned
   // from various editing callbacks that are called just before edit operations
   // are allowed.
   static bool accepts_editing_;
 
   // If true, new windows can be opened via javascript or by plugins.  By
@@ skipping 10 matching lines @@
   // DidStartProvisionalLoadForFrame callback.
   static bool stop_provisional_frame_loads_;
 
   // If true, don't dump output until notifyDone is called.
   static bool wait_until_done_;
 
   static WorkQueue work_queue_;
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_LAYOUT_TEST_CONTROLLER_H_