base::Bind: Cleanup in test_shell.

webkit/tools/test_shell/layout_test_controller.cc

 // 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.
 
 // This file contains the definition for LayoutTestController.
 
 #include <vector>
 
 #include "webkit/tools/test_shell/layout_test_controller.h"
 
 #include "base/base64.h"
 #include "base/basictypes.h"
+#include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/net_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAnimationController.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
@@ skipping 39 matching lines @@
 // Most of these flags need to be cleared in Reset() so that they get turned
 // off between each test run.
 bool LayoutTestController::accepts_editing_ = true;
 bool LayoutTestController::wait_until_done_ = false;
 bool LayoutTestController::can_open_windows_ = false;
 bool LayoutTestController::close_remaining_windows_ = true;
 bool LayoutTestController::stop_provisional_frame_loads_ = false;
 LayoutTestController::WorkQueue LayoutTestController::work_queue_;
 
 LayoutTestController::LayoutTestController(TestShell* shell) :
-    ALLOW_THIS_IN_INITIALIZER_LIST(timeout_factory_(this)) {
+    ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   // Set static shell_ variable since we can't do it in an initializer list.
   // We also need to be careful not to assign shell_ to new windows which are
   // temporary.
   if (NULL == shell_)
     shell_ = shell;
 
   // Initialize the map that associates methods of this class with the names
   // they will use when called by JavaScript.  The actual binding of those
   // names to their methods will be done by calling BindToJavaScript() (defined
   // by CppBoundClass, the parent to LayoutTestController).
@@ skipping 61 matching lines @@
     const CppArgumentList& args, CppVariant* result) {
   bool is_debugger_present = false;
 #if defined(OS_WIN)
   // TODO(ojan): Make cross-platform.
   is_debugger_present = ::IsDebuggerPresent();
 #endif
 
   if (!is_debugger_present) {
     // TODO(ojan): Use base::OneShotTimer. For some reason, using OneShotTimer
     // seems to cause layout test failures on the try bots.
-    MessageLoop::current()->PostDelayedTask(FROM_HERE,
-        timeout_factory_.NewRunnableMethod(
-            &LayoutTestController::notifyDoneTimedOut),
+    MessageLoop::current()->PostDelayedTask(
+        FROM_HERE,
+        base::Bind(&LayoutTestController::notifyDoneTimedOut,
+                   weak_factory_.GetWeakPtr()),
         shell_->GetLayoutTestTimeout());
   }
 
   wait_until_done_ = true;
   result->SetNull();
 }
 
 void LayoutTestController::notifyDone(
     const CppArgumentList& args, CppVariant* result) {
   // Test didn't timeout. Kill the timeout timer.
-  timeout_factory_.RevokeAll();
+  weak_factory_.InvalidateWeakPtrs();
 
   completeNotifyDone(false);
   result->SetNull();
 }
 
 void LayoutTestController::notifyDoneTimedOut() {
   completeNotifyDone(true);
 }
 
 void LayoutTestController::completeNotifyDone(bool is_timeout) {
@@ skipping 91 matching lines @@
   }
   result->SetNull();
 }
 
 void LayoutTestController::LogErrorToConsole(const std::string& text) {
   shell_->delegate()->didAddMessageToConsole(
       WebConsoleMessage(WebConsoleMessage::LevelError,
                         WebString::fromUTF8(text)),
       WebString(), 0);
 }