[ChromeOS] Stop treating RunnableFunction as Cancelable in mock_url_fetchers.cc

BUG=81541
TEST=unit tests

R=dmaclach@chromium.org


Review URL: http://codereview.chromium.org/6935035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84702 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 11 insertions, 12 deletions

diff --git a/chrome/browser/chromeos/login/mock_url_fetchers.cc b/chrome/browser/chromeos/login/mock_url_fetchers.cc
index 2a855c2..14e462c 100644
--- a/chrome/browser/chromeos/login/mock_url_fetchers.cc
+++ b/chrome/browser/chromeos/login/mock_url_fetchers.cc
@@ -23,22 +23,21 @@ ExpectCanceledFetcher::ExpectCanceledFetcher(
     const std::string& results,
     URLFetcher::RequestType request_type,
     URLFetcher::Delegate* d)
-    : URLFetcher(url, request_type, d) {
+    : URLFetcher(url, request_type, d),
+      ALLOW_THIS_IN_INITIALIZER_LIST(complete_fetch_factory_(this)) {
 }
 
 ExpectCanceledFetcher::~ExpectCanceledFetcher() {
-  task_->Cancel();
 }
 
 void ExpectCanceledFetcher::Start() {
-  task_ = NewRunnableFunction(&ExpectCanceledFetcher::CompleteFetch);
-  BrowserThread::PostDelayedTask(BrowserThread::UI,
-                                 FROM_HERE,
-                                 task_,
-                                 100);
+  MessageLoop::current()->PostDelayedTask(
+      FROM_HERE,
+      complete_fetch_factory_.NewRunnableMethod(
+          &ExpectCanceledFetcher::CompleteFetch),
+      100);
 }
 
-// static
 void ExpectCanceledFetcher::CompleteFetch() {
   ADD_FAILURE() << "Fetch completed in ExpectCanceledFetcher!";
   MessageLoop::current()->Quit();  // Allow exiting even if we mess up.
diff --git a/chrome/browser/chromeos/login/mock_url_fetchers.h b/chrome/browser/chromeos/login/mock_url_fetchers.h
index 522fc7e..d7370ca 100644
--- a/chrome/browser/chromeos/login/mock_url_fetchers.h
+++ b/chrome/browser/chromeos/login/mock_url_fetchers.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/message_loop.h"
+#include "base/task.h"
 #include "chrome/common/net/url_fetcher.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request_status.h"
@@ -28,11 +29,10 @@ class ExpectCanceledFetcher : public URLFetcher {
 
   void Start();
 
-  static void CompleteFetch();
+  void CompleteFetch();
 
  private:
-  CancelableTask* task_;
-
+  ScopedRunnableMethodFactory<ExpectCanceledFetcher> complete_fetch_factory_;
   DISALLOW_COPY_AND_ASSIGN(ExpectCanceledFetcher);
 };