diff options
82 files changed, 452 insertions, 447 deletions
diff --git a/base/base.gyp b/base/base.gyp index cb0731d..9779333 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -615,6 +615,7 @@ 'synchronization/waitable_event_watcher_unittest.cc', 'sys_info_unittest.cc', 'system_monitor/system_monitor_unittest.cc', + 'task/cancelable_task_tracker_unittest.cc', 'task_runner_util_unittest.cc', 'template_util_unittest.cc', 'test/expectations/expectation_unittest.cc', diff --git a/base/base.gypi b/base/base.gypi index 08ffe4a..2d3a01d 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -572,6 +572,8 @@ 'sys_info_openbsd.cc', 'sys_info_posix.cc', 'sys_info_win.cc', + 'task/cancelable_task_tracker.cc', + 'task/cancelable_task_tracker.h', 'task_runner.cc', 'task_runner.h', 'task_runner_util.h', diff --git a/chrome/common/cancelable_task_tracker.cc b/base/task/cancelable_task_tracker.cc index 4f2c9af..801223e 100644 --- a/chrome/common/cancelable_task_tracker.cc +++ b/base/task/cancelable_task_tracker.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 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 "chrome/common/cancelable_task_tracker.h" +#include "base/task/cancelable_task_tracker.h" #include <utility> @@ -54,12 +54,13 @@ void RunOrPostToTaskRunner(TaskRunner* task_runner, const Closure& closure) { } // namespace +namespace base { + // static const CancelableTaskTracker::TaskId CancelableTaskTracker::kBadTaskId = 0; CancelableTaskTracker::CancelableTaskTracker() - : weak_factory_(this), - next_id_(1) {} + : weak_factory_(this), next_id_(1) {} CancelableTaskTracker::~CancelableTaskTracker() { DCHECK(thread_checker_.CalledOnValidThread()); @@ -92,13 +93,15 @@ CancelableTaskTracker::TaskId CancelableTaskTracker::PostTaskAndReply( TaskId id = next_id_; next_id_++; // int64 is big enough that we ignore the potential overflow. - const Closure& untrack_closure = Bind( - &CancelableTaskTracker::Untrack, weak_factory_.GetWeakPtr(), id); - bool success = task_runner->PostTaskAndReply( - from_here, - Bind(&RunIfNotCanceled, flag, task), - Bind(&RunIfNotCanceledThenUntrack, - base::Owned(flag), reply, untrack_closure)); + const Closure& untrack_closure = + Bind(&CancelableTaskTracker::Untrack, weak_factory_.GetWeakPtr(), id); + bool success = + task_runner->PostTaskAndReply(from_here, + Bind(&RunIfNotCanceled, flag, task), + Bind(&RunIfNotCanceledThenUntrack, + base::Owned(flag), + reply, + untrack_closure)); if (!success) return kBadTaskId; @@ -125,13 +128,12 @@ CancelableTaskTracker::TaskId CancelableTaskTracker::NewTrackedTaskId( // Will always run |untrack_and_delete_flag| on current MessageLoop. base::ScopedClosureRunner* untrack_and_delete_flag_runner = - new base::ScopedClosureRunner( - Bind(&RunOrPostToTaskRunner, - base::MessageLoopProxy::current(), - untrack_and_delete_flag)); + new base::ScopedClosureRunner(Bind(&RunOrPostToTaskRunner, + base::MessageLoopProxy::current(), + untrack_and_delete_flag)); - *is_canceled_cb = Bind( - &IsCanceled, flag, base::Owned(untrack_and_delete_flag_runner)); + *is_canceled_cb = + Bind(&IsCanceled, flag, base::Owned(untrack_and_delete_flag_runner)); Track(id, flag); return id; @@ -181,3 +183,5 @@ void CancelableTaskTracker::Untrack(TaskId id) { size_t num = task_flags_.erase(id); DCHECK_EQ(1u, num); } + +} // namespace base diff --git a/chrome/common/cancelable_task_tracker.h b/base/task/cancelable_task_tracker.h index 2776d02..21cb45d 100644 --- a/chrome/common/cancelable_task_tracker.h +++ b/base/task/cancelable_task_tracker.h @@ -1,14 +1,15 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 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. -// CancelableTaskTracker posts tasks (in the form of a Closure) to a TaskRunner, -// and is able to cancel the task later if it's not needed anymore. On -// destruction, CancelableTaskTracker will cancel all tracked tasks. +// CancelableTaskTracker posts tasks (in the form of a Closure) to a +// TaskRunner, and is able to cancel the task later if it's not needed +// anymore. On destruction, CancelableTaskTracker will cancel all +// tracked tasks. // // Each cancelable task can be associated with a reply (also a Closure). After -// the task is run on the TaskRunner, |reply| will be posted back to originating -// TaskRunner. +// the task is run on the TaskRunner, |reply| will be posted back to +// originating TaskRunner. // // NOTE: // @@ -17,39 +18,41 @@ // cancelation from another thread. This is sometimes a performance critical // requirement. E.g. We need to cancel database lookup task on DB thread when // user changes inputed text. If it is performance critical to do a best effort -// cancelation of a task, then CancelableTaskTracker is appropriate, otherwise -// use one of the other mechanisms. +// cancelation of a task, then CancelableTaskTracker is appropriate, +// otherwise use one of the other mechanisms. // // THREAD-SAFETY: // -// 1. CancelableTaskTracker objects are not thread safe. They must be created, -// used, and destroyed on the originating thread that posts the task. It's safe -// to destroy a CancelableTaskTracker while there are outstanding tasks. This is -// commonly used to cancel all outstanding tasks. +// 1. CancelableTaskTracker objects are not thread safe. They must +// be created, used, and destroyed on the originating thread that posts the +// task. It's safe to destroy a CancelableTaskTracker while there +// are outstanding tasks. This is commonly used to cancel all outstanding +// tasks. // // 2. Both task and reply are deleted on the originating thread. // -// 3. IsCanceledCallback is thread safe and can be run or deleted on any thread. - -#ifndef CHROME_COMMON_CANCELABLE_TASK_TRACKER_H_ -#define CHROME_COMMON_CANCELABLE_TASK_TRACKER_H_ +// 3. IsCanceledCallback is thread safe and can be run or deleted on any +// thread. +#ifndef BASE_TASK_CANCELABLE_TASK_TRACKER_H_ +#define BASE_TASK_CANCELABLE_TASK_TRACKER_H_ +#include "base/base_export.h" #include "base/basictypes.h" #include "base/callback.h" #include "base/containers/hash_tables.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" -namespace base { -class CancellationFlag; -class TaskRunner; -} // namespace base - namespace tracked_objects { class Location; } // namespace tracked_objects -class CancelableTaskTracker { +namespace base { + +class CancellationFlag; +class TaskRunner; + +class BASE_EXPORT CancelableTaskTracker { public: // All values except kBadTaskId are valid. typedef int64 TaskId; @@ -112,4 +115,6 @@ class CancelableTaskTracker { DISALLOW_COPY_AND_ASSIGN(CancelableTaskTracker); }; -#endif // CHROME_COMMON_CANCELABLE_TASK_TRACKER_H_ +} // namespace base + +#endif // BASE_TASK_CANCELABLE_TASK_TRACKER_H_ diff --git a/chrome/common/cancelable_task_tracker_unittest.cc b/base/task/cancelable_task_tracker_unittest.cc index 6323379..e122e8d 100644 --- a/chrome/common/cancelable_task_tracker_unittest.cc +++ b/base/task/cancelable_task_tracker_unittest.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright 2014 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 "chrome/common/cancelable_task_tracker.h" +#include "base/task/cancelable_task_tracker.h" #include <cstddef> #include <deque> @@ -19,16 +19,16 @@ #include "base/threading/thread.h" #include "testing/gtest/include/gtest/gtest.h" +namespace base { + namespace { class CancelableTaskTrackerTest : public testing::Test { protected: - virtual ~CancelableTaskTrackerTest() { - RunCurrentLoopUntilIdle(); - } + virtual ~CancelableTaskTrackerTest() { RunCurrentLoopUntilIdle(); } void RunCurrentLoopUntilIdle() { - base::RunLoop run_loop; + RunLoop run_loop; run_loop.RunUntilIdle(); } @@ -36,7 +36,7 @@ class CancelableTaskTrackerTest : public testing::Test { private: // Needed by CancelableTaskTracker methods. - base::MessageLoop message_loop_; + MessageLoop message_loop_; }; void AddFailureAt(const tracked_objects::Location& location) { @@ -44,9 +44,8 @@ void AddFailureAt(const tracked_objects::Location& location) { } // Returns a closure that fails if run. -base::Closure MakeExpectedNotRunClosure( - const tracked_objects::Location& location) { - return base::Bind(&AddFailureAt, location); +Closure MakeExpectedNotRunClosure(const tracked_objects::Location& location) { + return Bind(&AddFailureAt, location); } // A helper class for MakeExpectedRunClosure() that fails if it is @@ -56,8 +55,7 @@ base::Closure MakeExpectedNotRunClosure( class RunChecker { public: explicit RunChecker(const tracked_objects::Location& location) - : location_(location), - called_(false) {} + : location_(location), called_(false) {} ~RunChecker() { if (!called_) { @@ -65,9 +63,7 @@ class RunChecker { } } - void Run() { - called_ = true; - } + void Run() { called_ = true; } private: tracked_objects::Location location_; @@ -75,16 +71,17 @@ class RunChecker { }; // Returns a closure that fails on destruction if it hasn't been run. -base::Closure MakeExpectedRunClosure( - const tracked_objects::Location& location) { - return base::Bind(&RunChecker::Run, base::Owned(new RunChecker(location))); +Closure MakeExpectedRunClosure(const tracked_objects::Location& location) { + return Bind(&RunChecker::Run, Owned(new RunChecker(location))); } +} // namespace + // With the task tracker, post a task, a task with a reply, and get a // new task id without canceling any of them. The tasks and the reply // should run and the "is canceled" callback should return false. TEST_F(CancelableTaskTrackerTest, NoCancel) { - base::Thread worker_thread("worker thread"); + Thread worker_thread("worker thread"); ASSERT_TRUE(worker_thread.Start()); ignore_result(task_tracker_.PostTask(worker_thread.message_loop_proxy().get(), @@ -110,14 +107,11 @@ TEST_F(CancelableTaskTrackerTest, NoCancel) { // Post a task with the task tracker but cancel it before running the // task runner. The task should not run. TEST_F(CancelableTaskTrackerTest, CancelPostedTask) { - scoped_refptr<base::TestSimpleTaskRunner> test_task_runner( - new base::TestSimpleTaskRunner()); + scoped_refptr<TestSimpleTaskRunner> test_task_runner( + new TestSimpleTaskRunner()); - CancelableTaskTracker::TaskId task_id = - task_tracker_.PostTask( - test_task_runner.get(), - FROM_HERE, - MakeExpectedNotRunClosure(FROM_HERE)); + CancelableTaskTracker::TaskId task_id = task_tracker_.PostTask( + test_task_runner.get(), FROM_HERE, MakeExpectedNotRunClosure(FROM_HERE)); EXPECT_NE(CancelableTaskTracker::kBadTaskId, task_id); EXPECT_EQ(1U, test_task_runner->GetPendingTasks().size()); @@ -131,15 +125,14 @@ TEST_F(CancelableTaskTrackerTest, CancelPostedTask) { // running the task runner. Neither the task nor the reply should // run. TEST_F(CancelableTaskTrackerTest, CancelPostedTaskAndReply) { - scoped_refptr<base::TestSimpleTaskRunner> test_task_runner( - new base::TestSimpleTaskRunner()); + scoped_refptr<TestSimpleTaskRunner> test_task_runner( + new TestSimpleTaskRunner()); CancelableTaskTracker::TaskId task_id = - task_tracker_.PostTaskAndReply( - test_task_runner.get(), - FROM_HERE, - MakeExpectedNotRunClosure(FROM_HERE), - MakeExpectedNotRunClosure(FROM_HERE)); + task_tracker_.PostTaskAndReply(test_task_runner.get(), + FROM_HERE, + MakeExpectedNotRunClosure(FROM_HERE), + MakeExpectedNotRunClosure(FROM_HERE)); EXPECT_NE(CancelableTaskTracker::kBadTaskId, task_id); task_tracker_.TryCancel(task_id); @@ -151,15 +144,14 @@ TEST_F(CancelableTaskTrackerTest, CancelPostedTaskAndReply) { // running the task runner but before running the current message // loop. The task should run but the reply should not. TEST_F(CancelableTaskTrackerTest, CancelReply) { - scoped_refptr<base::TestSimpleTaskRunner> test_task_runner( - new base::TestSimpleTaskRunner()); + scoped_refptr<TestSimpleTaskRunner> test_task_runner( + new TestSimpleTaskRunner()); CancelableTaskTracker::TaskId task_id = - task_tracker_.PostTaskAndReply( - test_task_runner.get(), - FROM_HERE, - MakeExpectedRunClosure(FROM_HERE), - MakeExpectedNotRunClosure(FROM_HERE)); + task_tracker_.PostTaskAndReply(test_task_runner.get(), + FROM_HERE, + MakeExpectedRunClosure(FROM_HERE), + MakeExpectedNotRunClosure(FROM_HERE)); EXPECT_NE(CancelableTaskTracker::kBadTaskId, task_id); test_task_runner->RunUntilIdle(); @@ -171,13 +163,13 @@ TEST_F(CancelableTaskTrackerTest, CancelReply) { // cancel it before running the current message loop. The task should // run but the reply should not. TEST_F(CancelableTaskTrackerTest, CancelReplyDifferentThread) { - base::Thread worker_thread("worker thread"); + Thread worker_thread("worker thread"); ASSERT_TRUE(worker_thread.Start()); CancelableTaskTracker::TaskId task_id = task_tracker_.PostTaskAndReply(worker_thread.message_loop_proxy().get(), FROM_HERE, - base::Bind(&base::DoNothing), + Bind(&DoNothing), MakeExpectedNotRunClosure(FROM_HERE)); EXPECT_NE(CancelableTaskTracker::kBadTaskId, task_id); @@ -202,19 +194,17 @@ TEST_F(CancelableTaskTrackerTest, NewTrackedTaskIdDifferentThread) { EXPECT_FALSE(is_canceled.Run()); - base::Thread other_thread("other thread"); + Thread other_thread("other thread"); ASSERT_TRUE(other_thread.Start()); other_thread.message_loop_proxy()->PostTask( - FROM_HERE, - base::Bind(&ExpectIsCanceled, is_canceled, false)); + FROM_HERE, Bind(&ExpectIsCanceled, is_canceled, false)); other_thread.Stop(); task_tracker_.TryCancel(task_id); ASSERT_TRUE(other_thread.Start()); other_thread.message_loop_proxy()->PostTask( - FROM_HERE, - base::Bind(&ExpectIsCanceled, is_canceled, true)); + FROM_HERE, Bind(&ExpectIsCanceled, is_canceled, true)); other_thread.Stop(); } @@ -223,8 +213,8 @@ TEST_F(CancelableTaskTrackerTest, NewTrackedTaskIdDifferentThread) { // reply should run and the "is canceled" callback should return // true. TEST_F(CancelableTaskTrackerTest, CancelAll) { - scoped_refptr<base::TestSimpleTaskRunner> test_task_runner( - new base::TestSimpleTaskRunner()); + scoped_refptr<TestSimpleTaskRunner> test_task_runner( + new TestSimpleTaskRunner()); ignore_result(task_tracker_.PostTask( test_task_runner.get(), FROM_HERE, MakeExpectedNotRunClosure(FROM_HERE))); @@ -252,8 +242,8 @@ TEST_F(CancelableTaskTrackerTest, CancelAll) { // reply should run and the "is canceled" callback should return // true. TEST_F(CancelableTaskTrackerTest, DestructionCancelsAll) { - scoped_refptr<base::TestSimpleTaskRunner> test_task_runner( - new base::TestSimpleTaskRunner()); + scoped_refptr<TestSimpleTaskRunner> test_task_runner( + new TestSimpleTaskRunner()); CancelableTaskTracker::IsCanceledCallback is_canceled; @@ -285,8 +275,8 @@ TEST_F(CancelableTaskTrackerTest, DestructionCancelsAll) { // from when the task is posted until the (do-nothing) reply task is // flushed. TEST_F(CancelableTaskTrackerTest, HasTrackedTasksPost) { - scoped_refptr<base::TestSimpleTaskRunner> test_task_runner( - new base::TestSimpleTaskRunner()); + scoped_refptr<TestSimpleTaskRunner> test_task_runner( + new TestSimpleTaskRunner()); EXPECT_FALSE(task_tracker_.HasTrackedTasks()); @@ -307,8 +297,8 @@ TEST_F(CancelableTaskTrackerTest, HasTrackedTasksPost) { // Post a task with a reply and cancel it. HasTrackedTasks() should // return true from when the task is posted until it is canceled. TEST_F(CancelableTaskTrackerTest, HasTrackedTasksPostWithReply) { - scoped_refptr<base::TestSimpleTaskRunner> test_task_runner( - new base::TestSimpleTaskRunner()); + scoped_refptr<TestSimpleTaskRunner> test_task_runner( + new TestSimpleTaskRunner()); EXPECT_FALSE(task_tracker_.HasTrackedTasks()); @@ -371,32 +361,30 @@ class CancelableTaskTrackerDeathTest : public CancelableTaskTrackerTest { // Runs |fn| with |task_tracker|, expecting it to crash in debug mode. void MaybeRunDeadlyTaskTrackerMemberFunction( CancelableTaskTracker* task_tracker, - const base::Callback<void(CancelableTaskTracker*)>& fn) { - // CancelableTask uses DCHECKs with its ThreadChecker (itself only - // enabled in debug mode). + const Callback<void(CancelableTaskTracker*)>& fn) { +// CancelableTask uses DCHECKs with its ThreadChecker (itself only +// enabled in debug mode). #if ENABLE_THREAD_CHECKER EXPECT_DEATH_IF_SUPPORTED(fn.Run(task_tracker), ""); #endif } void PostDoNothingTask(CancelableTaskTracker* task_tracker) { - ignore_result( - task_tracker->PostTask(scoped_refptr<base::TestSimpleTaskRunner>( - new base::TestSimpleTaskRunner()) - .get(), - FROM_HERE, - base::Bind(&base::DoNothing))); + ignore_result(task_tracker->PostTask( + scoped_refptr<TestSimpleTaskRunner>(new TestSimpleTaskRunner()).get(), + FROM_HERE, + Bind(&DoNothing))); } TEST_F(CancelableTaskTrackerDeathTest, PostFromDifferentThread) { - base::Thread bad_thread("bad thread"); + Thread bad_thread("bad thread"); ASSERT_TRUE(bad_thread.Start()); bad_thread.message_loop_proxy()->PostTask( FROM_HERE, - base::Bind(&MaybeRunDeadlyTaskTrackerMemberFunction, - base::Unretained(&task_tracker_), - base::Bind(&PostDoNothingTask))); + Bind(&MaybeRunDeadlyTaskTrackerMemberFunction, + Unretained(&task_tracker_), + Bind(&PostDoNothingTask))); } void TryCancel(CancelableTaskTracker::TaskId task_id, @@ -405,49 +393,43 @@ void TryCancel(CancelableTaskTracker::TaskId task_id, } TEST_F(CancelableTaskTrackerDeathTest, CancelOnDifferentThread) { - scoped_refptr<base::TestSimpleTaskRunner> test_task_runner( - new base::TestSimpleTaskRunner()); + scoped_refptr<TestSimpleTaskRunner> test_task_runner( + new TestSimpleTaskRunner()); - base::Thread bad_thread("bad thread"); + Thread bad_thread("bad thread"); ASSERT_TRUE(bad_thread.Start()); - CancelableTaskTracker::TaskId task_id = - task_tracker_.PostTask( - test_task_runner.get(), - FROM_HERE, - base::Bind(&base::DoNothing)); + CancelableTaskTracker::TaskId task_id = task_tracker_.PostTask( + test_task_runner.get(), FROM_HERE, Bind(&DoNothing)); EXPECT_NE(CancelableTaskTracker::kBadTaskId, task_id); bad_thread.message_loop_proxy()->PostTask( FROM_HERE, - base::Bind(&MaybeRunDeadlyTaskTrackerMemberFunction, - base::Unretained(&task_tracker_), - base::Bind(&TryCancel, task_id))); + Bind(&MaybeRunDeadlyTaskTrackerMemberFunction, + Unretained(&task_tracker_), + Bind(&TryCancel, task_id))); test_task_runner->RunUntilIdle(); } TEST_F(CancelableTaskTrackerDeathTest, CancelAllOnDifferentThread) { - scoped_refptr<base::TestSimpleTaskRunner> test_task_runner( - new base::TestSimpleTaskRunner()); + scoped_refptr<TestSimpleTaskRunner> test_task_runner( + new TestSimpleTaskRunner()); - base::Thread bad_thread("bad thread"); + Thread bad_thread("bad thread"); ASSERT_TRUE(bad_thread.Start()); - CancelableTaskTracker::TaskId task_id = - task_tracker_.PostTask( - test_task_runner.get(), - FROM_HERE, - base::Bind(&base::DoNothing)); + CancelableTaskTracker::TaskId task_id = task_tracker_.PostTask( + test_task_runner.get(), FROM_HERE, Bind(&DoNothing)); EXPECT_NE(CancelableTaskTracker::kBadTaskId, task_id); bad_thread.message_loop_proxy()->PostTask( FROM_HERE, - base::Bind(&MaybeRunDeadlyTaskTrackerMemberFunction, - base::Unretained(&task_tracker_), - base::Bind(&CancelableTaskTracker::TryCancelAll))); + Bind(&MaybeRunDeadlyTaskTrackerMemberFunction, + Unretained(&task_tracker_), + Bind(&CancelableTaskTracker::TryCancelAll))); test_task_runner->RunUntilIdle(); } -} // namespace +} // namespace base diff --git a/chrome/android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java index c272214..879ea1b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java @@ -13,9 +13,10 @@ import org.chromium.chrome.browser.profiles.Profile; /** * This is a helper class to use favicon_service.cc's functionality. * - * You can request a favicon image by web page URL. Note that an instance of this class should be - * created & used & destroyed (by destroy()) in the same thread due to the C++ CancelableTaskTracker - * class requirement. + * You can request a favicon image by web page URL. Note that an instance of + * this class should be created & used & destroyed (by destroy()) in the same + * thread due to the C++ base::CancelableTaskTracker class + * requirement. */ public class FaviconHelper { diff --git a/chrome/browser/android/favicon_helper.cc b/chrome/browser/android/favicon_helper.cc index 006ea85..e00bed9 100644 --- a/chrome/browser/android/favicon_helper.cc +++ b/chrome/browser/android/favicon_helper.cc @@ -62,7 +62,7 @@ static jlong Init(JNIEnv* env, jclass clazz) { } FaviconHelper::FaviconHelper() { - cancelable_task_tracker_.reset(new CancelableTaskTracker()); + cancelable_task_tracker_.reset(new base::CancelableTaskTracker()); } void FaviconHelper::Destroy(JNIEnv* env, jobject obj) { diff --git a/chrome/browser/android/favicon_helper.h b/chrome/browser/android/favicon_helper.h index 1866c80..c74646e 100644 --- a/chrome/browser/android/favicon_helper.h +++ b/chrome/browser/android/favicon_helper.h @@ -9,7 +9,7 @@ #include "base/android/scoped_java_ref.h" #include "base/memory/scoped_ptr.h" -#include "chrome/common/cancelable_task_tracker.h" +#include "base/task/cancelable_task_tracker.h" class FaviconHelper { public: @@ -31,7 +31,7 @@ class FaviconHelper { static bool RegisterFaviconHelper(JNIEnv* env); private: - scoped_ptr<CancelableTaskTracker> cancelable_task_tracker_; + scoped_ptr<base::CancelableTaskTracker> cancelable_task_tracker_; virtual ~FaviconHelper(); diff --git a/chrome/browser/android/provider/chrome_browser_provider.cc b/chrome/browser/android/provider/chrome_browser_provider.cc index 794a868..f59de09 100644 --- a/chrome/browser/android/provider/chrome_browser_provider.cc +++ b/chrome/browser/android/provider/chrome_browser_provider.cc @@ -13,6 +13,7 @@ #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/utf_string_conversions.h" +#include "base/task/cancelable_task_tracker.h" #include "base/time/time.h" #include "chrome/browser/android/provider/blocking_ui_thread_async_request.h" #include "chrome/browser/android/provider/bookmark_model_observer_task.h" @@ -31,7 +32,6 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" -#include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "grit/generated_resources.h" @@ -641,19 +641,19 @@ class FaviconServiceTask : public AsyncServiceRequest<FaviconService> { FaviconServiceTask(FaviconService* service, Profile* profile, CancelableRequestConsumer* cancelable_consumer, - CancelableTaskTracker* cancelable_tracker) + base::CancelableTaskTracker* cancelable_tracker) : AsyncServiceRequest<FaviconService>(service, cancelable_consumer), profile_(profile), cancelable_tracker_(cancelable_tracker) {} Profile* profile() const { return profile_; } - CancelableTaskTracker* cancelable_tracker() const { + base::CancelableTaskTracker* cancelable_tracker() const { return cancelable_tracker_; } private: Profile* profile_; - CancelableTaskTracker* cancelable_tracker_; + base::CancelableTaskTracker* cancelable_tracker_; DISALLOW_COPY_AND_ASSIGN(FaviconServiceTask); }; @@ -661,13 +661,14 @@ class FaviconServiceTask : public AsyncServiceRequest<FaviconService> { // Retrieves the favicon or touch icon for a URL from the FaviconService. class BookmarkIconFetchTask : public FaviconServiceTask { public: - BookmarkIconFetchTask( - FaviconService* favicon_service, - Profile* profile, - CancelableRequestConsumer* cancelable_consumer, - CancelableTaskTracker* cancelable_tracker) - : FaviconServiceTask(favicon_service, profile, - cancelable_consumer, cancelable_tracker) {} + BookmarkIconFetchTask(FaviconService* favicon_service, + Profile* profile, + CancelableRequestConsumer* cancelable_consumer, + base::CancelableTaskTracker* cancelable_tracker) + : FaviconServiceTask(favicon_service, + profile, + cancelable_consumer, + cancelable_tracker) {} chrome::FaviconBitmapResult Run(const GURL& url) { RunAsyncRequestOnUIThreadBlocking( diff --git a/chrome/browser/android/provider/chrome_browser_provider.h b/chrome/browser/android/provider/chrome_browser_provider.h index 53e5dda..4e6dea4 100644 --- a/chrome/browser/android/provider/chrome_browser_provider.h +++ b/chrome/browser/android/provider/chrome_browser_provider.h @@ -9,10 +9,10 @@ #include "base/android/scoped_java_ref.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/waitable_event.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/bookmarks/base_bookmark_model_observer.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/browser/history/android/android_history_types.h" -#include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -201,7 +201,7 @@ class ChromeBrowserProvider : public BaseBookmarkModelObserver, CancelableRequestConsumer android_history_consumer_; CancelableRequestConsumer favicon_consumer_; - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; // Used to register/unregister notification observer. content::NotificationRegistrar notification_registrar_; diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc index 05763f7..872f17d 100644 --- a/chrome/browser/android/shortcut_helper.cc +++ b/chrome/browser/android/shortcut_helper.cc @@ -11,11 +11,11 @@ #include "base/basictypes.h" #include "base/location.h" #include "base/strings/string16.h" +#include "base/task/cancelable_task_tracker.h" #include "base/threading/worker_pool.h" #include "chrome/browser/android/tab_android.h" #include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" -#include "chrome/common/cancelable_task_tracker.h" #include "chrome/common/render_messages.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/android/shortcut_helper.h b/chrome/browser/android/shortcut_helper.h index e9059ae..ad0183d 100644 --- a/chrome/browser/android/shortcut_helper.h +++ b/chrome/browser/android/shortcut_helper.h @@ -8,8 +8,8 @@ #include "base/android/jni_helper.h" #include "base/basictypes.h" #include "base/strings/string16.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/android/tab_android.h" -#include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/web_contents_observer.h" namespace chrome { @@ -66,7 +66,7 @@ class ShortcutBuilder : public content::WebContentsObserver { base::string16 title_; int launcher_large_icon_size_; ShortcutType shortcut_type_; - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; DISALLOW_COPY_AND_ASSIGN(ShortcutBuilder); }; diff --git a/chrome/browser/bookmarks/bookmark_html_writer.h b/chrome/browser/bookmarks/bookmark_html_writer.h index de1ea3b..a049551 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.h +++ b/chrome/browser/bookmarks/bookmark_html_writer.h @@ -12,7 +12,7 @@ #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" -#include "chrome/common/cancelable_task_tracker.h" +#include "base/task/cancelable_task_tracker.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -79,7 +79,7 @@ class BookmarkFaviconFetcher: public content::NotificationObserver { std::list<std::string> bookmark_urls_; // Tracks favicon tasks. - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; // Map that stores favicon per URL. scoped_ptr<URLFaviconMap> favicons_map_; diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc index 84b78a8..6611a04 100644 --- a/chrome/browser/bookmarks/bookmark_model.cc +++ b/chrome/browser/bookmarks/bookmark_model.cc @@ -138,7 +138,7 @@ void BookmarkNode::Initialize(int64 id) { type_ = url_.is_empty() ? FOLDER : URL; date_added_ = Time::Now(); favicon_state_ = INVALID_FAVICON; - favicon_load_task_id_ = CancelableTaskTracker::kBadTaskId; + favicon_load_task_id_ = base::CancelableTaskTracker::kBadTaskId; meta_info_map_.reset(); sync_transaction_version_ = kInvalidSyncTransactionVersion; } @@ -987,7 +987,7 @@ void BookmarkModel::OnFaviconDataAvailable( BookmarkNode* node, const chrome::FaviconImageResult& image_result) { DCHECK(node); - node->set_favicon_load_task_id(CancelableTaskTracker::kBadTaskId); + node->set_favicon_load_task_id(base::CancelableTaskTracker::kBadTaskId); node->set_favicon_state(BookmarkNode::LOADED_FAVICON); if (!image_result.image.IsEmpty()) { node->set_favicon(image_result.image); @@ -1021,9 +1021,9 @@ void BookmarkModel::FaviconLoaded(const BookmarkNode* node) { } void BookmarkModel::CancelPendingFaviconLoadRequests(BookmarkNode* node) { - if (node->favicon_load_task_id() != CancelableTaskTracker::kBadTaskId) { + if (node->favicon_load_task_id() != base::CancelableTaskTracker::kBadTaskId) { cancelable_task_tracker_.TryCancel(node->favicon_load_task_id()); - node->set_favicon_load_task_id(CancelableTaskTracker::kBadTaskId); + node->set_favicon_load_task_id(base::CancelableTaskTracker::kBadTaskId); } } diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h index 9bb3526..5578bc1 100644 --- a/chrome/browser/bookmarks/bookmark_model.h +++ b/chrome/browser/bookmarks/bookmark_model.h @@ -17,8 +17,8 @@ #include "base/strings/string16.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/bookmarks/bookmark_service.h" -#include "chrome/common/cancelable_task_tracker.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -162,10 +162,10 @@ class BookmarkNode : public ui::TreeNode<BookmarkNode> { FaviconState favicon_state() const { return favicon_state_; } void set_favicon_state(FaviconState state) { favicon_state_ = state; } - CancelableTaskTracker::TaskId favicon_load_task_id() const { + base::CancelableTaskTracker::TaskId favicon_load_task_id() const { return favicon_load_task_id_; } - void set_favicon_load_task_id(CancelableTaskTracker::TaskId id) { + void set_favicon_load_task_id(base::CancelableTaskTracker::TaskId id) { favicon_load_task_id_ = id; } @@ -194,9 +194,10 @@ class BookmarkNode : public ui::TreeNode<BookmarkNode> { // The loading state of the favicon. FaviconState favicon_state_; - // If not CancelableTaskTracker::kBadTaskId, it indicates we're loading the + // If not base::CancelableTaskTracker::kBadTaskId, it indicates + // we're loading the // favicon and the task is tracked by CancelabelTaskTracker. - CancelableTaskTracker::TaskId favicon_load_task_id_; + base::CancelableTaskTracker::TaskId favicon_load_task_id_; // A map that stores arbitrary meta information about the node. scoped_ptr<MetaInfoMap> meta_info_map_; @@ -560,7 +561,7 @@ class BookmarkModel : public content::NotificationObserver, base::Lock url_lock_; // Used for loading favicons. - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; // Reads/writes bookmarks to disk. scoped_refptr<BookmarkStorage> store_; diff --git a/chrome/browser/browsing_data/browsing_data_remover.h b/chrome/browser/browsing_data/browsing_data_remover.h index a15d3da..abc26a6 100644 --- a/chrome/browser/browsing_data/browsing_data_remover.h +++ b/chrome/browser/browsing_data/browsing_data_remover.h @@ -13,10 +13,10 @@ #include "base/prefs/pref_member.h" #include "base/sequenced_task_runner_helpers.h" #include "base/synchronization/waitable_event_watcher.h" +#include "base/task/cancelable_task_tracker.h" #include "base/time/time.h" #include "chrome/browser/pepper_flash_settings_manager.h" #include "chrome/browser/search_engines/template_url_service.h" -#include "chrome/common/cancelable_task_tracker.h" #if defined(OS_CHROMEOS) #include "chromeos/dbus/dbus_method_call_status.h" #endif @@ -401,7 +401,7 @@ class BrowsingDataRemover ObserverList<Observer> observer_list_; // Used if we need to clear history. - CancelableTaskTracker history_task_tracker_; + base::CancelableTaskTracker history_task_tracker_; scoped_ptr<TemplateURLService::Subscription> template_url_sub_; diff --git a/chrome/browser/chromeos/boot_times_loader.h b/chrome/browser/chromeos/boot_times_loader.h index 2abc164..32f88b2 100644 --- a/chrome/browser/chromeos/boot_times_loader.h +++ b/chrome/browser/chromeos/boot_times_loader.h @@ -11,8 +11,8 @@ #include "base/atomic_sequence_num.h" #include "base/callback_forward.h" #include "base/compiler_specific.h" +#include "base/task/cancelable_task_tracker.h" #include "base/time/time.h" -#include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/render_widget_host.h" @@ -25,7 +25,7 @@ namespace chromeos { // To use BootTimesLoader, do the following: // // . In your class define a member field of type chromeos::BootTimesLoader and -// CancelableTaskTracker. +// base::CancelableTaskTracker. // . Define the callback method, something like: // void OnBootTimesLoaded(const BootTimesLoader::BootTimes& boot_times); // . When you want the version invoke: loader.GetBootTimes(callback, &tracker_); diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.h b/chrome/browser/chromeos/chrome_browser_main_chromeos.h index 5862ea7..4a6038c 100644 --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.h +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ #include "base/memory/scoped_ptr.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/chrome_browser_main_linux.h" #include "chrome/browser/chromeos/version_loader.h" -#include "chrome/common/cancelable_task_tracker.h" namespace contacts { class ContactManager; @@ -73,7 +73,7 @@ class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux { scoped_ptr<internal::DBusServices> dbus_services_; VersionLoader cros_version_loader_; - CancelableTaskTracker tracker_; + base::CancelableTaskTracker tracker_; bool use_new_network_change_notifier_; DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); diff --git a/chrome/browser/chromeos/login/version_info_updater.h b/chrome/browser/chromeos/login/version_info_updater.h index bde2594..b8474e8 100644 --- a/chrome/browser/chromeos/login/version_info_updater.h +++ b/chrome/browser/chromeos/login/version_info_updater.h @@ -67,7 +67,7 @@ class VersionInfoUpdater : public policy::CloudPolicyStore::Observer { // Handles asynchronously loading the boot times. BootTimesLoader boot_times_loader_; // Used to request version and boot times. - CancelableTaskTracker tracker_; + base::CancelableTaskTracker tracker_; // Information pieces for version label. std::string version_text_; diff --git a/chrome/browser/chromeos/policy/device_status_collector.h b/chrome/browser/chromeos/policy/device_status_collector.h index 3f584c1..a787721 100644 --- a/chrome/browser/chromeos/policy/device_status_collector.h +++ b/chrome/browser/chromeos/policy/device_status_collector.h @@ -13,12 +13,12 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/task/cancelable_task_tracker.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/version_loader.h" #include "chrome/browser/idle.h" -#include "chrome/common/cancelable_task_tracker.h" #include "components/policy/core/common/cloud/cloud_policy_client.h" #include "content/public/browser/geolocation_provider.h" #include "content/public/common/geoposition.h" @@ -180,7 +180,7 @@ class DeviceStatusCollector : public CloudPolicyClient::StatusProvider { base::OneShotTimer<DeviceStatusCollector> geolocation_update_timer_; chromeos::VersionLoader version_loader_; - CancelableTaskTracker tracker_; + base::CancelableTaskTracker tracker_; std::string os_version_; std::string firmware_version_; diff --git a/chrome/browser/chromeos/system/syslogs_provider.cc b/chrome/browser/chromeos/system/syslogs_provider.cc index 340b7df..f8fd4b0 100644 --- a/chrome/browser/chromeos/system/syslogs_provider.cc +++ b/chrome/browser/chromeos/system/syslogs_provider.cc @@ -182,11 +182,11 @@ LogDictionaryType* GetSystemLogs(base::FilePath* zip_file_name, class SyslogsProviderImpl : public SyslogsProvider { public: // SyslogsProvider implementation: - virtual CancelableTaskTracker::TaskId RequestSyslogs( + virtual base::CancelableTaskTracker::TaskId RequestSyslogs( bool compress_logs, SyslogsContext context, const ReadCompleteCallback& callback, - CancelableTaskTracker* tracker) OVERRIDE; + base::CancelableTaskTracker* tracker) OVERRIDE; static SyslogsProviderImpl* GetInstance(); @@ -196,7 +196,7 @@ class SyslogsProviderImpl : public SyslogsProvider { // Reads system logs, compresses content if requested. // Called from blocking pool thread. void ReadSyslogs( - const CancelableTaskTracker::IsCanceledCallback& is_canceled, + const base::CancelableTaskTracker::IsCanceledCallback& is_canceled, bool compress_logs, SyslogsContext context, const ReadCompleteCallback& callback); @@ -213,7 +213,7 @@ class SyslogsProviderImpl : public SyslogsProvider { // If not canceled, run callback on originating thread (the thread on which // ReadSyslogs was run). static void RunCallbackIfNotCanceled( - const CancelableTaskTracker::IsCanceledCallback& is_canceled, + const base::CancelableTaskTracker::IsCanceledCallback& is_canceled, base::TaskRunner* origin_runner, const ReadCompleteCallback& callback, LogDictionaryType* logs, @@ -225,13 +225,14 @@ class SyslogsProviderImpl : public SyslogsProvider { SyslogsProviderImpl::SyslogsProviderImpl() { } -CancelableTaskTracker::TaskId SyslogsProviderImpl::RequestSyslogs( +base::CancelableTaskTracker::TaskId SyslogsProviderImpl::RequestSyslogs( bool compress_logs, SyslogsContext context, const ReadCompleteCallback& callback, - CancelableTaskTracker* tracker) { - CancelableTaskTracker::IsCanceledCallback is_canceled; - CancelableTaskTracker::TaskId id = tracker->NewTrackedTaskId(&is_canceled); + base::CancelableTaskTracker* tracker) { + base::CancelableTaskTracker::IsCanceledCallback is_canceled; + base::CancelableTaskTracker::TaskId id = + tracker->NewTrackedTaskId(&is_canceled); ReadCompleteCallback callback_runner = base::Bind(&SyslogsProviderImpl::RunCallbackIfNotCanceled, @@ -295,7 +296,7 @@ SyslogsMemoryHandler::~SyslogsMemoryHandler() {} // Called from blocking pool thread. void SyslogsProviderImpl::ReadSyslogs( - const CancelableTaskTracker::IsCanceledCallback& is_canceled, + const base::CancelableTaskTracker::IsCanceledCallback& is_canceled, bool compress_logs, SyslogsContext context, const ReadCompleteCallback& callback) { @@ -373,7 +374,7 @@ const char* SyslogsProviderImpl::GetSyslogsContextString( // static void SyslogsProviderImpl::RunCallbackIfNotCanceled( - const CancelableTaskTracker::IsCanceledCallback& is_canceled, + const base::CancelableTaskTracker::IsCanceledCallback& is_canceled, base::TaskRunner* origin_runner, const ReadCompleteCallback& callback, LogDictionaryType* logs, diff --git a/chrome/browser/chromeos/system/syslogs_provider.h b/chrome/browser/chromeos/system/syslogs_provider.h index 08074f7..8fa1877 100644 --- a/chrome/browser/chromeos/system/syslogs_provider.h +++ b/chrome/browser/chromeos/system/syslogs_provider.h @@ -9,7 +9,7 @@ #include <string> #include "base/callback.h" -#include "chrome/common/cancelable_task_tracker.h" +#include "base/task/cancelable_task_tracker.h" namespace chromeos { namespace system { @@ -44,13 +44,14 @@ class SyslogsProvider { // Request system logs. Read happens on the FILE thread and callback is // called on the thread this is called from. Logs are owned by callback // function (use delete when done with them). - // Call CancelableTaskTracker::TryCancel() with the returned task ID to cancel + // Call base::CancelableTaskTracker::TryCancel() with the returned + // task ID to cancel // task and callback. - virtual CancelableTaskTracker::TaskId RequestSyslogs( + virtual base::CancelableTaskTracker::TaskId RequestSyslogs( bool compress_logs, SyslogsContext context, const ReadCompleteCallback& callback, - CancelableTaskTracker* tracker) = 0; + base::CancelableTaskTracker* tracker) = 0; protected: virtual ~SyslogsProvider() {} diff --git a/chrome/browser/chromeos/version_loader.cc b/chrome/browser/chromeos/version_loader.cc index 60e0017..853410f 100644 --- a/chrome/browser/chromeos/version_loader.cc +++ b/chrome/browser/chromeos/version_loader.cc @@ -53,10 +53,10 @@ VersionLoader::VersionLoader() : backend_(new Backend()) {} VersionLoader::~VersionLoader() {} -CancelableTaskTracker::TaskId VersionLoader::GetVersion( +base::CancelableTaskTracker::TaskId VersionLoader::GetVersion( VersionFormat format, const GetVersionCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { std::string* version = new std::string(); return tracker->PostTaskAndReply( BrowserThread::GetBlockingPool(), @@ -65,9 +65,9 @@ CancelableTaskTracker::TaskId VersionLoader::GetVersion( base::Bind(&VersionLoaderCallbackHelper, callback, base::Owned(version))); } -CancelableTaskTracker::TaskId VersionLoader::GetFirmware( +base::CancelableTaskTracker::TaskId VersionLoader::GetFirmware( const GetFirmwareCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { std::string* firmware = new std::string(); return tracker->PostTaskAndReply( BrowserThread::GetBlockingPool(), diff --git a/chrome/browser/chromeos/version_loader.h b/chrome/browser/chromeos/version_loader.h index 6361bcb..de6e5f9 100644 --- a/chrome/browser/chromeos/version_loader.h +++ b/chrome/browser/chromeos/version_loader.h @@ -9,7 +9,7 @@ #include "base/callback.h" #include "base/gtest_prod_util.h" -#include "chrome/common/cancelable_task_tracker.h" +#include "base/task/cancelable_task_tracker.h" namespace chromeos { @@ -20,7 +20,7 @@ namespace chromeos { // To use ChromeOSVersionLoader do the following: // // . In your class define a member field of type chromeos::VersionLoader and -// CancelableTaskTracker. +// base::CancelableTaskTracker. // . Define the callback method, something like: // void OnGetChromeOSVersion(const std::string& version); // . When you want the version invoke: @@ -46,12 +46,14 @@ class VersionLoader { // Asynchronously requests the version. // If |full_version| is true version string with extra info is extracted, // otherwise it's in short format x.x.xx.x. - CancelableTaskTracker::TaskId GetVersion(VersionFormat format, - const GetVersionCallback& callback, - CancelableTaskTracker* tracker); - - CancelableTaskTracker::TaskId GetFirmware(const GetFirmwareCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker::TaskId GetVersion( + VersionFormat format, + const GetVersionCallback& callback, + base::CancelableTaskTracker* tracker); + + base::CancelableTaskTracker::TaskId GetFirmware( + const GetFirmwareCallback& callback, + base::CancelableTaskTracker* tracker); private: FRIEND_TEST_ALL_PREFIXES(VersionLoaderTest, ParseFirmware); diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc index e9bee6c..0e063eb 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc @@ -26,6 +26,7 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" +#include "base/task/cancelable_task_tracker.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" @@ -50,7 +51,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/common/cancelable_task_tracker.h" #include "chrome/common/extensions/api/downloads.h" #include "components/web_modal/web_contents_modal_dialog_manager.h" #include "content/public/browser/download_interrupt_reasons.h" @@ -311,7 +311,7 @@ class DownloadFileIconExtractorImpl : public DownloadFileIconExtractor { void OnIconLoadComplete( float scale, const IconURLCallback& callback, gfx::Image* icon); - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; }; bool DownloadFileIconExtractorImpl::ExtractIconURLForPath( diff --git a/chrome/browser/extensions/api/history/history_api.cc b/chrome/browser/extensions/api/history/history_api.cc index 70eeeba..9abd10f 100644 --- a/chrome/browser/extensions/api/history/history_api.cc +++ b/chrome/browser/extensions/api/history/history_api.cc @@ -15,6 +15,7 @@ #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "base/task/cancelable_task_tracker.h" #include "base/time/time.h" #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" @@ -23,7 +24,6 @@ #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/cancelable_task_tracker.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/api/history.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/extensions/api/history/history_api.h b/chrome/browser/extensions/api/history/history_api.h index 2638f9a..bf7acc2 100644 --- a/chrome/browser/extensions/api/history/history_api.h +++ b/chrome/browser/extensions/api/history/history_api.h @@ -9,11 +9,11 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "chrome/browser/history/history_notifications.h" #include "chrome/browser/history/history_service.h" -#include "chrome/common/cancelable_task_tracker.h" #include "chrome/common/extensions/api/history.h" #include "content/public/browser/notification_registrar.h" #include "extensions/browser/event_router.h" @@ -118,7 +118,7 @@ class HistoryFunctionWithCallback : public HistoryFunction { // The consumer for the HistoryService callbacks. CancelableRequestConsumer cancelable_consumer_; - CancelableTaskTracker task_tracker_; + base::CancelableTaskTracker task_tracker_; private: // The actual call to SendResponse. This is required since the semantics for diff --git a/chrome/browser/extensions/api/image_writer_private/operation.h b/chrome/browser/extensions/api/image_writer_private/operation.h index 80092cfa..58c0814 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation.h +++ b/chrome/browser/extensions/api/image_writer_private/operation.h @@ -9,9 +9,9 @@ #include "base/md5.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h" +#include "base/task/cancelable_task_tracker.h" #include "base/timer/timer.h" #include "chrome/browser/extensions/api/image_writer_private/image_writer_utils.h" -#include "chrome/common/cancelable_task_tracker.h" #include "chrome/common/extensions/api/image_writer_private.h" #include "third_party/zlib/google/zip_reader.h" diff --git a/chrome/browser/favicon/favicon_handler.cc b/chrome/browser/favicon/favicon_handler.cc index 3e817c6..3785bbc 100644 --- a/chrome/browser/favicon/favicon_handler.cc +++ b/chrome/browser/favicon/favicon_handler.cc @@ -449,7 +449,7 @@ void FaviconHandler::UpdateFaviconMappingAndFetch( const GURL& icon_url, chrome::IconType icon_type, const FaviconService::FaviconResultsCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { // TODO(pkotwicz): pass in all of |image_urls_| to // UpdateFaviconMappingsAndFetch(). std::vector<GURL> icon_urls; @@ -462,7 +462,7 @@ void FaviconHandler::GetFavicon( const GURL& icon_url, chrome::IconType icon_type, const FaviconService::FaviconResultsCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { GetFaviconService()->GetFavicon( icon_url, icon_type, preferred_icon_size(), callback, tracker); } @@ -471,7 +471,7 @@ void FaviconHandler::GetFaviconForURL( const GURL& page_url, int icon_types, const FaviconService::FaviconResultsCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { GetFaviconService()->GetFaviconForURL( FaviconService::FaviconForURLParams(page_url, icon_types, preferred_icon_size()), diff --git a/chrome/browser/favicon/favicon_handler.h b/chrome/browser/favicon/favicon_handler.h index 91e8e8f..a88407f 100644 --- a/chrome/browser/favicon/favicon_handler.h +++ b/chrome/browser/favicon/favicon_handler.h @@ -10,9 +10,9 @@ #include "base/basictypes.h" #include "base/callback_forward.h" #include "base/memory/ref_counted.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_tab_helper.h" -#include "chrome/common/cancelable_task_tracker.h" #include "chrome/common/ref_counted_util.h" #include "content/public/common/favicon_url.h" #include "ui/gfx/favicon_size.h" @@ -133,19 +133,19 @@ class FaviconHandler { const GURL& icon_url, chrome::IconType icon_type, const FaviconService::FaviconResultsCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); virtual void GetFavicon( const GURL& icon_url, chrome::IconType icon_type, const FaviconService::FaviconResultsCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); virtual void GetFaviconForURL( const GURL& page_url, int icon_types, const FaviconService::FaviconResultsCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); virtual void SetHistoryFavicons(const GURL& page_url, const GURL& icon_url, @@ -253,7 +253,7 @@ class FaviconHandler { } // Used for FaviconService requests. - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; // URL of the page we're requesting the favicon for. GURL url_; diff --git a/chrome/browser/favicon/favicon_handler_unittest.cc b/chrome/browser/favicon/favicon_handler_unittest.cc index 08cc59a..68e044e 100644 --- a/chrome/browser/favicon/favicon_handler_unittest.cc +++ b/chrome/browser/favicon/favicon_handler_unittest.cc @@ -258,7 +258,7 @@ class TestFaviconHandler : public FaviconHandler { const GURL& icon_url, chrome::IconType icon_type, const FaviconService::FaviconResultsCallback& callback, - CancelableTaskTracker* tracker) OVERRIDE { + base::CancelableTaskTracker* tracker) OVERRIDE { history_handler_.reset(new HistoryRequestHandler(page_url, icon_url, icon_type, callback)); } @@ -267,7 +267,7 @@ class TestFaviconHandler : public FaviconHandler { const GURL& icon_url, chrome::IconType icon_type, const FaviconService::FaviconResultsCallback& callback, - CancelableTaskTracker* tracker) OVERRIDE { + base::CancelableTaskTracker* tracker) OVERRIDE { history_handler_.reset(new HistoryRequestHandler(GURL(), icon_url, icon_type, callback)); } @@ -276,7 +276,7 @@ class TestFaviconHandler : public FaviconHandler { const GURL& page_url, int icon_types, const FaviconService::FaviconResultsCallback& callback, - CancelableTaskTracker* tracker) OVERRIDE { + base::CancelableTaskTracker* tracker) OVERRIDE { history_handler_.reset(new HistoryRequestHandler(page_url, GURL(), icon_types, callback)); } diff --git a/chrome/browser/favicon/favicon_service.cc b/chrome/browser/favicon/favicon_service.cc index 6b1d9f8..9c45370 100644 --- a/chrome/browser/favicon/favicon_service.cc +++ b/chrome/browser/favicon/favicon_service.cc @@ -26,7 +26,7 @@ using base::Bind; namespace { void CancelOrRunFaviconResultsCallback( - const CancelableTaskTracker::IsCanceledCallback& is_canceled, + const base::CancelableTaskTracker::IsCanceledCallback& is_canceled, const FaviconService::FaviconResultsCallback& callback, const std::vector<chrome::FaviconBitmapResult>& results) { if (is_canceled.Run()) @@ -36,9 +36,9 @@ void CancelOrRunFaviconResultsCallback( // Helper to run callback with empty results if we cannot get the history // service. -CancelableTaskTracker::TaskId RunWithEmptyResultAsync( +base::CancelableTaskTracker::TaskId RunWithEmptyResultAsync( const FaviconService::FaviconResultsCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { return tracker->PostTask( base::MessageLoopProxy::current().get(), FROM_HERE, @@ -46,14 +46,15 @@ CancelableTaskTracker::TaskId RunWithEmptyResultAsync( } // Return the TaskId to retreive the favicon from chrome specific URL. -CancelableTaskTracker::TaskId GetFaviconForChromeURL( +base::CancelableTaskTracker::TaskId GetFaviconForChromeURL( Profile* profile, const GURL& page_url, const std::vector<ui::ScaleFactor>& desired_scale_factors, const FaviconService::FaviconResultsCallback& callback, - CancelableTaskTracker* tracker) { - CancelableTaskTracker::IsCanceledCallback is_canceled_cb; - CancelableTaskTracker::TaskId id = tracker->NewTrackedTaskId(&is_canceled_cb); + base::CancelableTaskTracker* tracker) { + base::CancelableTaskTracker::IsCanceledCallback is_canceled_cb; + base::CancelableTaskTracker::TaskId id = + tracker->NewTrackedTaskId(&is_canceled_cb); FaviconService::FaviconResultsCallback cancelable_cb = Bind(&CancelOrRunFaviconResultsCallback, is_canceled_cb, callback); ChromeWebUIControllerFactory::GetInstance()->GetFaviconForURL(profile, @@ -76,12 +77,12 @@ void FaviconService::FaviconResultsCallbackRunner( callback.Run(*results); } -CancelableTaskTracker::TaskId FaviconService::GetFaviconImage( +base::CancelableTaskTracker::TaskId FaviconService::GetFaviconImage( const GURL& icon_url, chrome::IconType icon_type, int desired_size_in_dip, const FaviconImageCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { FaviconResultsCallback callback_runner = Bind(&FaviconService::RunFaviconImageCallbackWithBitmapResults, base::Unretained(this), callback, desired_size_in_dip); @@ -96,13 +97,13 @@ CancelableTaskTracker::TaskId FaviconService::GetFaviconImage( } } -CancelableTaskTracker::TaskId FaviconService::GetRawFavicon( +base::CancelableTaskTracker::TaskId FaviconService::GetRawFavicon( const GURL& icon_url, chrome::IconType icon_type, int desired_size_in_dip, ui::ScaleFactor desired_scale_factor, const FaviconRawCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { FaviconResultsCallback callback_runner = Bind(&FaviconService::RunFaviconRawCallbackWithBitmapResults, base::Unretained(this), @@ -122,12 +123,12 @@ CancelableTaskTracker::TaskId FaviconService::GetRawFavicon( } } -CancelableTaskTracker::TaskId FaviconService::GetFavicon( +base::CancelableTaskTracker::TaskId FaviconService::GetFavicon( const GURL& icon_url, chrome::IconType icon_type, int desired_size_in_dip, const FaviconResultsCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { if (history_service_) { std::vector<GURL> icon_urls; icon_urls.push_back(icon_url); @@ -139,13 +140,14 @@ CancelableTaskTracker::TaskId FaviconService::GetFavicon( } } -CancelableTaskTracker::TaskId FaviconService::UpdateFaviconMappingsAndFetch( +base::CancelableTaskTracker::TaskId +FaviconService::UpdateFaviconMappingsAndFetch( const GURL& page_url, const std::vector<GURL>& icon_urls, int icon_types, int desired_size_in_dip, const FaviconResultsCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { if (history_service_) { return history_service_->UpdateFaviconMappingsAndFetch( page_url, icon_urls, icon_types, desired_size_in_dip, @@ -155,10 +157,10 @@ CancelableTaskTracker::TaskId FaviconService::UpdateFaviconMappingsAndFetch( } } -CancelableTaskTracker::TaskId FaviconService::GetFaviconImageForURL( +base::CancelableTaskTracker::TaskId FaviconService::GetFaviconImageForURL( const FaviconForURLParams& params, const FaviconImageCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { return GetFaviconForURLImpl( params, FaviconUtil::GetFaviconScaleFactors(), @@ -169,11 +171,11 @@ CancelableTaskTracker::TaskId FaviconService::GetFaviconImageForURL( tracker); } -CancelableTaskTracker::TaskId FaviconService::GetRawFaviconForURL( +base::CancelableTaskTracker::TaskId FaviconService::GetRawFaviconForURL( const FaviconForURLParams& params, ui::ScaleFactor desired_scale_factor, const FaviconRawCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { std::vector<ui::ScaleFactor> desired_scale_factors; desired_scale_factors.push_back(desired_scale_factor); return GetFaviconForURLImpl( @@ -187,13 +189,13 @@ CancelableTaskTracker::TaskId FaviconService::GetRawFaviconForURL( tracker); } -CancelableTaskTracker::TaskId FaviconService::GetLargestRawFaviconForURL( +base::CancelableTaskTracker::TaskId FaviconService::GetLargestRawFaviconForURL( Profile* profile, const GURL& page_url, const std::vector<int>& icon_types, int minimum_size_in_pixels, const FaviconRawCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { FaviconResultsCallback favicon_results_callback = Bind(&FaviconService::RunFaviconRawCallbackWithBitmapResults, base::Unretained(this), callback, 0, ui::ScaleFactor()); @@ -210,20 +212,20 @@ CancelableTaskTracker::TaskId FaviconService::GetLargestRawFaviconForURL( return RunWithEmptyResultAsync(favicon_results_callback, tracker); } -CancelableTaskTracker::TaskId FaviconService::GetFaviconForURL( +base::CancelableTaskTracker::TaskId FaviconService::GetFaviconForURL( const FaviconForURLParams& params, const FaviconResultsCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { return GetFaviconForURLImpl(params, FaviconUtil::GetFaviconScaleFactors(), callback, tracker); } -CancelableTaskTracker::TaskId FaviconService::GetLargestRawFaviconForID( +base::CancelableTaskTracker::TaskId FaviconService::GetLargestRawFaviconForID( chrome::FaviconID favicon_id, const FaviconRawCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { // Use 0 as |desired_size_in_dip| to get the largest bitmap for |favicon_id| // without any resizing. int desired_size_in_dip = 0; @@ -318,11 +320,11 @@ void FaviconService::ClearUnableToDownloadFavicons() { FaviconService::~FaviconService() {} -CancelableTaskTracker::TaskId FaviconService::GetFaviconForURLImpl( +base::CancelableTaskTracker::TaskId FaviconService::GetFaviconForURLImpl( const FaviconForURLParams& params, const std::vector<ui::ScaleFactor>& desired_scale_factors, const FaviconResultsCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { if (params.page_url.SchemeIs(chrome::kChromeUIScheme) || params.page_url.SchemeIs(extensions::kExtensionScheme)) { return GetFaviconForChromeURL(profile_, params.page_url, diff --git a/chrome/browser/favicon/favicon_service.h b/chrome/browser/favicon/favicon_service.h index 8ec0846..4d38e39 100644 --- a/chrome/browser/favicon/favicon_service.h +++ b/chrome/browser/favicon/favicon_service.h @@ -10,8 +10,8 @@ #include "base/callback.h" #include "base/containers/hash_tables.h" #include "base/memory/ref_counted.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/common/cancelable_request.h" -#include "chrome/common/cancelable_task_tracker.h" #include "chrome/common/favicon/favicon_types.h" #include "chrome/common/ref_counted_util.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" @@ -95,27 +95,27 @@ class FaviconService : public CancelableRequestProvider, // Each of the three methods below differs in the format of the callback and // the requested scale factors. All of the scale factors supported by the // current platform (eg MacOS) are requested for GetFaviconImage(). - CancelableTaskTracker::TaskId GetFaviconImage( + base::CancelableTaskTracker::TaskId GetFaviconImage( const GURL& icon_url, chrome::IconType icon_type, int desired_size_in_dip, const FaviconImageCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); - CancelableTaskTracker::TaskId GetRawFavicon( + base::CancelableTaskTracker::TaskId GetRawFavicon( const GURL& icon_url, chrome::IconType icon_type, int desired_size_in_dip, ui::ScaleFactor desired_scale_factor, const FaviconRawCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); - CancelableTaskTracker::TaskId GetFavicon( + base::CancelableTaskTracker::TaskId GetFavicon( const GURL& icon_url, chrome::IconType icon_type, int desired_size_in_dip, const FaviconResultsCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); // Set the favicon mappings to |page_url| for |icon_types| in the history // database. @@ -137,13 +137,13 @@ class FaviconService : public CancelableRequestProvider, // addition to 1x from the favicons which were just mapped to |page_url| are // returned. If |desired_size_in_dip| is 0, the largest favicon bitmap is // returned. - CancelableTaskTracker::TaskId UpdateFaviconMappingsAndFetch( + base::CancelableTaskTracker::TaskId UpdateFaviconMappingsAndFetch( const GURL& page_url, const std::vector<GURL>& icon_urls, int icon_types, int desired_size_in_dip, const FaviconResultsCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); // Requests the favicons of any of |icon_types| whose pixel sizes most // closely match |desired_size_in_dip| and desired scale factors for a web @@ -156,39 +156,39 @@ class FaviconService : public CancelableRequestProvider, // supported by the current platform (eg MacOS) are requested for // GetFaviconImageForURL(). // Note. |callback| is always run asynchronously. - CancelableTaskTracker::TaskId GetFaviconImageForURL( + base::CancelableTaskTracker::TaskId GetFaviconImageForURL( const FaviconForURLParams& params, const FaviconImageCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); - CancelableTaskTracker::TaskId GetRawFaviconForURL( + base::CancelableTaskTracker::TaskId GetRawFaviconForURL( const FaviconForURLParams& params, ui::ScaleFactor desired_scale_factor, const FaviconRawCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); // See HistoryService::GetLargestFaviconForURL(). - CancelableTaskTracker::TaskId GetLargestRawFaviconForURL( + base::CancelableTaskTracker::TaskId GetLargestRawFaviconForURL( Profile* profile, const GURL& page_url, const std::vector<int>& icon_types, int minimum_size_in_pixels, const FaviconRawCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); - CancelableTaskTracker::TaskId GetFaviconForURL( + base::CancelableTaskTracker::TaskId GetFaviconForURL( const FaviconForURLParams& params, const FaviconResultsCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); // Used to request a bitmap for the favicon with |favicon_id| which is not // resized from the size it is stored at in the database. If there are // multiple favicon bitmaps for |favicon_id|, the largest favicon bitmap is // returned. - CancelableTaskTracker::TaskId GetLargestRawFaviconForID( + base::CancelableTaskTracker::TaskId GetLargestRawFaviconForID( chrome::FaviconID favicon_id, const FaviconRawCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); // Marks all types of favicon for the page as being out of date. void SetFaviconOutOfDateForPage(const GURL& page_url); @@ -245,11 +245,11 @@ class FaviconService : public CancelableRequestProvider, // Helper function for GetFaviconImageForURL(), GetRawFaviconForURL() and // GetFaviconForURL(). - CancelableTaskTracker::TaskId GetFaviconForURLImpl( + base::CancelableTaskTracker::TaskId GetFaviconForURLImpl( const FaviconForURLParams& params, const std::vector<ui::ScaleFactor>& desired_scale_factors, const FaviconResultsCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); // Intermediate callback for GetFaviconImage() and GetFaviconImageForURL() // so that history service can deal solely with FaviconResultsCallback. diff --git a/chrome/browser/history/android/sqlite_cursor.cc b/chrome/browser/history/android/sqlite_cursor.cc index 53e9ef5..9fd16ce 100644 --- a/chrome/browser/history/android/sqlite_cursor.cc +++ b/chrome/browser/history/android/sqlite_cursor.cc @@ -205,7 +205,7 @@ void SQLiteCursor::GetFaviconForIDInUIThread( const FaviconService::FaviconRawCallback& callback) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); if (!tracker_.get()) - tracker_.reset(new CancelableTaskTracker()); + tracker_.reset(new base::CancelableTaskTracker()); favicon_service_->GetLargestRawFaviconForID(id, callback, tracker_.get()); } diff --git a/chrome/browser/history/android/sqlite_cursor.h b/chrome/browser/history/android/sqlite_cursor.h index 30a5b09..389a05c 100644 --- a/chrome/browser/history/android/sqlite_cursor.h +++ b/chrome/browser/history/android/sqlite_cursor.h @@ -14,11 +14,11 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/synchronization/waitable_event.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/history/android/android_history_provider_service.h" #include "chrome/browser/history/history_types.h" -#include "chrome/common/cancelable_task_tracker.h" // This class is JNI implementation of // org.chromium.chrome.database.SqliteCursor, it uses the AndroidStatement to @@ -181,7 +181,7 @@ class SQLiteCursor { // Live on UI thread. scoped_ptr<CancelableRequestConsumer> consumer_; - scoped_ptr<CancelableTaskTracker> tracker_; + scoped_ptr<base::CancelableTaskTracker> tracker_; // The count of result rows. int count_; diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc index cb9ae9b..4799efa 100644 --- a/chrome/browser/history/history_service.cc +++ b/chrome/browser/history/history_service.cc @@ -584,13 +584,13 @@ void HistoryService::AddPagesWithDetails(const history::URLRows& info, &HistoryBackend::AddPagesWithDetails, info, visit_source); } -CancelableTaskTracker::TaskId HistoryService::GetFavicons( +base::CancelableTaskTracker::TaskId HistoryService::GetFavicons( const std::vector<GURL>& icon_urls, int icon_types, int desired_size_in_dip, const std::vector<ui::ScaleFactor>& desired_scale_factors, const FaviconService::FaviconResultsCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { DCHECK(thread_checker_.CalledOnValidThread()); LoadBackendIfNecessary(); @@ -609,13 +609,13 @@ CancelableTaskTracker::TaskId HistoryService::GetFavicons( base::Bind(&RunWithFaviconResults, callback, base::Owned(results))); } -CancelableTaskTracker::TaskId HistoryService::GetFaviconsForURL( +base::CancelableTaskTracker::TaskId HistoryService::GetFaviconsForURL( const GURL& page_url, int icon_types, int desired_size_in_dip, const std::vector<ui::ScaleFactor>& desired_scale_factors, const FaviconService::FaviconResultsCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { DCHECK(thread_checker_.CalledOnValidThread()); LoadBackendIfNecessary(); @@ -634,12 +634,12 @@ CancelableTaskTracker::TaskId HistoryService::GetFaviconsForURL( base::Bind(&RunWithFaviconResults, callback, base::Owned(results))); } -CancelableTaskTracker::TaskId HistoryService::GetLargestFaviconForURL( +base::CancelableTaskTracker::TaskId HistoryService::GetLargestFaviconForURL( const GURL& page_url, const std::vector<int>& icon_types, int minimum_size_in_pixels, const FaviconService::FaviconRawCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { DCHECK(thread_checker_.CalledOnValidThread()); LoadBackendIfNecessary(); @@ -656,12 +656,12 @@ CancelableTaskTracker::TaskId HistoryService::GetLargestFaviconForURL( base::Bind(&RunWithFaviconResult, callback, base::Owned(result))); } -CancelableTaskTracker::TaskId HistoryService::GetFaviconForID( +base::CancelableTaskTracker::TaskId HistoryService::GetFaviconForID( chrome::FaviconID favicon_id, int desired_size_in_dip, ui::ScaleFactor desired_scale_factor, const FaviconService::FaviconResultsCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { DCHECK(thread_checker_.CalledOnValidThread()); LoadBackendIfNecessary(); @@ -679,14 +679,15 @@ CancelableTaskTracker::TaskId HistoryService::GetFaviconForID( base::Bind(&RunWithFaviconResults, callback, base::Owned(results))); } -CancelableTaskTracker::TaskId HistoryService::UpdateFaviconMappingsAndFetch( +base::CancelableTaskTracker::TaskId +HistoryService::UpdateFaviconMappingsAndFetch( const GURL& page_url, const std::vector<GURL>& icon_urls, int icon_types, int desired_size_in_dip, const std::vector<ui::ScaleFactor>& desired_scale_factors, const FaviconService::FaviconResultsCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { DCHECK(thread_checker_.CalledOnValidThread()); LoadBackendIfNecessary(); @@ -1114,7 +1115,7 @@ void HistoryService::ExpireHistoryBetween( Time begin_time, Time end_time, const base::Closure& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { DCHECK(thread_); DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(history_backend_.get()); @@ -1131,7 +1132,7 @@ void HistoryService::ExpireHistoryBetween( void HistoryService::ExpireHistory( const std::vector<history::ExpireHistoryArgs>& expire_list, const base::Closure& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { DCHECK(thread_); DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(history_backend_.get()); @@ -1147,7 +1148,7 @@ void HistoryService::ExpireLocalAndRemoteHistoryBetween( Time begin_time, Time end_time, const base::Closure& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { // TODO(dubroy): This should be factored out into a separate class that // dispatches deletions to the proper places. diff --git a/chrome/browser/history/history_service.h b/chrome/browser/history/history_service.h index 40e1df5..cf061de 100644 --- a/chrome/browser/history/history_service.h +++ b/chrome/browser/history/history_service.h @@ -18,6 +18,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/strings/string16.h" +#include "base/task/cancelable_task_tracker.h" #include "base/threading/thread_checker.h" #include "base/time/time.h" #include "chrome/browser/common/cancelable_request.h" @@ -26,7 +27,6 @@ #include "chrome/browser/history/history_types.h" #include "chrome/browser/history/typed_url_syncable_service.h" #include "chrome/browser/search_engines/template_url_id.h" -#include "chrome/common/cancelable_task_tracker.h" #include "chrome/common/ref_counted_util.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "components/visitedlink/browser/visitedlink_delegate.h" @@ -382,7 +382,7 @@ class HistoryService : public CancelableRequestProvider, base::Time begin_time, base::Time end_time, const base::Closure& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); // Removes all visits to specified URLs in specific time ranges. // This is the equivalent ExpireHistoryBetween() once for each element in the @@ -390,17 +390,16 @@ class HistoryService : public CancelableRequestProvider, // of ExpireHistoryBetween(). void ExpireHistory(const std::vector<history::ExpireHistoryArgs>& expire_list, const base::Closure& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); // Removes all visits to the given URLs in the specified time range. Calls // ExpireHistoryBetween() to delete local visits, and handles deletion of // synced visits if appropriate. - void ExpireLocalAndRemoteHistoryBetween( - const std::set<GURL>& restrict_urls, - base::Time begin_time, - base::Time end_time, - const base::Closure& callback, - CancelableTaskTracker* tracker); + void ExpireLocalAndRemoteHistoryBetween(const std::set<GURL>& restrict_urls, + base::Time begin_time, + base::Time end_time, + const base::Closure& callback, + base::CancelableTaskTracker* tracker); // Processes the given |delete_directive| and sends it to the // SyncChangeProcessor (if it exists). Returns any error resulting @@ -666,13 +665,13 @@ class HistoryService : public CancelableRequestProvider, // If |icon_types| has several types, results for only a single type will be // returned in the priority of TOUCH_PRECOMPOSED_ICON, TOUCH_ICON, and // FAVICON. - CancelableTaskTracker::TaskId GetFavicons( + base::CancelableTaskTracker::TaskId GetFavicons( const std::vector<GURL>& icon_urls, int icon_types, int desired_size_in_dip, const std::vector<ui::ScaleFactor>& desired_scale_factors, const FaviconService::FaviconResultsCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); // Used by the FaviconService to get favicons mapped to |page_url| for // |icon_types| which most closely match |desired_size_in_dip| and @@ -683,13 +682,13 @@ class HistoryService : public CancelableRequestProvider, // there will be less results. If |icon_types| has several types, results for // only a single type will be returned in the priority of // TOUCH_PRECOMPOSED_ICON, TOUCH_ICON, and FAVICON. - CancelableTaskTracker::TaskId GetFaviconsForURL( + base::CancelableTaskTracker::TaskId GetFaviconsForURL( const GURL& page_url, int icon_types, int desired_size_in_dip, const std::vector<ui::ScaleFactor>& desired_scale_factors, const FaviconService::FaviconResultsCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); // Used by FaviconService to find the first favicon bitmap whose width and // height are greater than that of |minimum_size_in_pixels|. This searches @@ -702,23 +701,23 @@ class HistoryService : public CancelableRequestProvider, // icon types in |icon_types| is returned. // This feature is especially useful when some types of icon is perfered as // long as its size is larger than a specific value. - CancelableTaskTracker::TaskId GetLargestFaviconForURL( + base::CancelableTaskTracker::TaskId GetLargestFaviconForURL( const GURL& page_url, const std::vector<int>& icon_types, int minimum_size_in_pixels, const FaviconService::FaviconRawCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); // Used by the FaviconService to get the favicon bitmap which most closely // matches |desired_size_in_dip| and |desired_scale_factor| from the favicon // with |favicon_id| from the history backend. If |desired_size_in_dip| is 0, // the largest favicon bitmap for |favicon_id| is returned. - CancelableTaskTracker::TaskId GetFaviconForID( + base::CancelableTaskTracker::TaskId GetFaviconForID( chrome::FaviconID favicon_id, int desired_size_in_dip, ui::ScaleFactor desired_scale_factor, const FaviconService::FaviconResultsCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); // Used by the FaviconService to replace the favicon mappings to |page_url| // for |icon_types| on the history backend. @@ -739,14 +738,14 @@ class HistoryService : public CancelableRequestProvider, // and |desired_scale_factors| from the favicons which were just mapped // to |page_url| are returned. If |desired_size_in_dip| is 0, the // largest favicon bitmap is returned. - CancelableTaskTracker::TaskId UpdateFaviconMappingsAndFetch( + base::CancelableTaskTracker::TaskId UpdateFaviconMappingsAndFetch( const GURL& page_url, const std::vector<GURL>& icon_urls, int icon_types, int desired_size_in_dip, const std::vector<ui::ScaleFactor>& desired_scale_factors, const FaviconService::FaviconResultsCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); // Used by FaviconService to set a favicon for |page_url| and |icon_url| with // |pixel_size|. diff --git a/chrome/browser/history/top_sites_backend.cc b/chrome/browser/history/top_sites_backend.cc index d142845..c76b75f 100644 --- a/chrome/browser/history/top_sites_backend.cc +++ b/chrome/browser/history/top_sites_backend.cc @@ -8,8 +8,8 @@ #include "base/bind_helpers.h" #include "base/files/file_path.h" #include "base/memory/ref_counted.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/history/top_sites_database.h" -#include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/browser_thread.h" using content::BrowserThread; @@ -34,8 +34,8 @@ void TopSitesBackend::Shutdown() { } void TopSitesBackend::GetMostVisitedThumbnails( - const GetMostVisitedThumbnailsCallback& callback, - CancelableTaskTracker* tracker) { + const GetMostVisitedThumbnailsCallback& callback, + base::CancelableTaskTracker* tracker) { scoped_refptr<MostVisitedThumbnails> thumbnails = new MostVisitedThumbnails(); tracker->PostTaskAndReply( @@ -69,7 +69,7 @@ void TopSitesBackend::ResetDatabase() { } void TopSitesBackend::DoEmptyRequest(const base::Closure& reply, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { tracker->PostTaskAndReply( BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB).get(), FROM_HERE, diff --git a/chrome/browser/history/top_sites_backend.h b/chrome/browser/history/top_sites_backend.h index cad49e1..3865e4b 100644 --- a/chrome/browser/history/top_sites_backend.h +++ b/chrome/browser/history/top_sites_backend.h @@ -11,9 +11,8 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/history/history_types.h" -class CancelableTaskTracker; - namespace base { +class CancelableTaskTracker; class FilePath; } @@ -41,7 +40,7 @@ class TopSitesBackend : public base::RefCountedThreadSafe<TopSitesBackend> { // Fetches MostVisitedThumbnails. void GetMostVisitedThumbnails( const GetMostVisitedThumbnailsCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); // Updates top sites database from the specified delta. void UpdateTopSites(const TopSitesDelta& delta); @@ -58,7 +57,7 @@ class TopSitesBackend : public base::RefCountedThreadSafe<TopSitesBackend> { // the the calling thread with a reply. This is used to make sure the db has // finished processing a request. void DoEmptyRequest(const base::Closure& reply, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); private: friend class base::RefCountedThreadSafe<TopSitesBackend>; diff --git a/chrome/browser/history/top_sites_impl.h b/chrome/browser/history/top_sites_impl.h index c527fda..8871418 100644 --- a/chrome/browser/history/top_sites_impl.h +++ b/chrome/browser/history/top_sites_impl.h @@ -16,6 +16,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" +#include "base/task/cancelable_task_tracker.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/common/cancelable_request.h" @@ -24,7 +25,6 @@ #include "chrome/browser/history/page_usage_data.h" #include "chrome/browser/history/top_sites.h" #include "chrome/browser/history/top_sites_backend.h" -#include "chrome/common/cancelable_task_tracker.h" #include "chrome/common/thumbnail_score.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/image/image.h" @@ -237,7 +237,7 @@ class TopSitesImpl : public TopSites { // Need a separate consumer for each CancelableRequestProvider we interact // with (HistoryService and TopSitesBackend). CancelableRequestConsumer history_consumer_; - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; // Timer that asks history for the top sites. This is used to make sure our // data stays in sync with history. diff --git a/chrome/browser/history/top_sites_impl_unittest.cc b/chrome/browser/history/top_sites_impl_unittest.cc index 69364fa..ae89a75 100644 --- a/chrome/browser/history/top_sites_impl_unittest.cc +++ b/chrome/browser/history/top_sites_impl_unittest.cc @@ -7,13 +7,13 @@ #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/history/history_db_task.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/history/history_unittest_base.h" #include "chrome/browser/history/top_sites_cache.h" #include "chrome/browser/history/top_sites_impl.h" -#include "chrome/common/cancelable_task_tracker.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/testing_profile.h" @@ -336,7 +336,7 @@ class TopSitesImplTest : public HistoryUnitTestBase { CancelableRequestConsumer consumer_; // To cancel TopSitesBackend tasks. - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; DISALLOW_COPY_AND_ASSIGN(TopSitesImplTest); }; // Class TopSitesImplTest diff --git a/chrome/browser/icon_manager.cc b/chrome/browser/icon_manager.cc index d0e2cbc..a329249 100644 --- a/chrome/browser/icon_manager.cc +++ b/chrome/browser/icon_manager.cc @@ -14,7 +14,7 @@ namespace { void RunCallbackIfNotCanceled( - const CancelableTaskTracker::IsCanceledCallback& is_canceled, + const base::CancelableTaskTracker::IsCanceledCallback& is_canceled, const IconManager::IconRequestCallback& callback, gfx::Image* image) { if (is_canceled.Run()) @@ -55,17 +55,18 @@ gfx::Image* IconManager::LookupIconFromGroup(const IconGroupID& group, return NULL; } -CancelableTaskTracker::TaskId IconManager::LoadIcon( +base::CancelableTaskTracker::TaskId IconManager::LoadIcon( const base::FilePath& file_name, IconLoader::IconSize size, const IconRequestCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { IconLoader* loader = new IconLoader(file_name, size, this); loader->AddRef(); loader->Start(); - CancelableTaskTracker::IsCanceledCallback is_canceled; - CancelableTaskTracker::TaskId id = tracker->NewTrackedTaskId(&is_canceled); + base::CancelableTaskTracker::IsCanceledCallback is_canceled; + base::CancelableTaskTracker::TaskId id = + tracker->NewTrackedTaskId(&is_canceled); IconRequestCallback callback_runner = base::Bind( &RunCallbackIfNotCanceled, is_canceled, callback); diff --git a/chrome/browser/icon_manager.h b/chrome/browser/icon_manager.h index dafd147..ad10d73 100644 --- a/chrome/browser/icon_manager.h +++ b/chrome/browser/icon_manager.h @@ -48,8 +48,8 @@ #include <map> #include "base/files/file_path.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/icon_loader.h" -#include "chrome/common/cancelable_task_tracker.h" #include "ui/gfx/image/image.h" class IconManager : public IconLoader::Delegate { @@ -77,10 +77,11 @@ class IconManager : public IconLoader::Delegate { // should never keep it or delete it. // 3. The gfx::Image pointer passed to the callback may be NULL if decoding // failed. - CancelableTaskTracker::TaskId LoadIcon(const base::FilePath& file_name, - IconLoader::IconSize size, - const IconRequestCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker::TaskId LoadIcon( + const base::FilePath& file_name, + IconLoader::IconSize size, + const IconRequestCallback& callback, + base::CancelableTaskTracker* tracker); // IconLoader::Delegate interface. virtual bool OnGroupLoaded(IconLoader* loader, diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc index 9ad7720..5b5da7b 100644 --- a/chrome/browser/jumplist_win.cc +++ b/chrome/browser/jumplist_win.cc @@ -466,8 +466,7 @@ bool UpdateJumpList(const wchar_t* app_id, JumpList::JumpList() : weak_ptr_factory_(this), profile_(NULL), - task_id_(CancelableTaskTracker::kBadTaskId) { -} + task_id_(base::CancelableTaskTracker::kBadTaskId) {} JumpList::~JumpList() { Terminate(); @@ -553,9 +552,9 @@ void JumpList::RemoveObserver() { } void JumpList::CancelPendingUpdate() { - if (task_id_ != CancelableTaskTracker::kBadTaskId) { + if (task_id_ != base::CancelableTaskTracker::kBadTaskId) { cancelable_task_tracker_.TryCancel(task_id_); - task_id_ = CancelableTaskTracker::kBadTaskId; + task_id_ = base::CancelableTaskTracker::kBadTaskId; } } @@ -697,7 +696,7 @@ void JumpList::OnFaviconDataAvailable( const chrome::FaviconImageResult& image_result) { // If there is currently a favicon request in progress, it is now outdated, // as we have received another, so nullify the handle from the old request. - task_id_ = CancelableTaskTracker::kBadTaskId; + task_id_ = base::CancelableTaskTracker::kBadTaskId; // lock the list to set icon data and pop the url { base::AutoLock auto_lock(list_lock_); diff --git a/chrome/browser/jumplist_win.h b/chrome/browser/jumplist_win.h index 581721c..f244053 100644 --- a/chrome/browser/jumplist_win.h +++ b/chrome/browser/jumplist_win.h @@ -13,11 +13,11 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/sessions/tab_restore_service_observer.h" -#include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/browser_thread.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -115,8 +115,8 @@ typedef std::vector<scoped_refptr<ShellLinkItem> > ShellLinkItemList; // update it in a UI thread. To solve this problem, this class posts to a // runnable method when it actually updates a JumpList. // -// Note. CancelableTaskTracker is not thread safe, so we always delete JumpList -// on UI thread (the same thread it got constructed on). +// Note. base::CancelableTaskTracker is not thread safe, so we +// always delete JumpList on UI thread (the same thread it got constructed on). class JumpList : public TabRestoreServiceObserver, public content::NotificationObserver, public base::RefCountedThreadSafe< @@ -218,7 +218,7 @@ class JumpList : public TabRestoreServiceObserver, base::WeakPtrFactory<JumpList> weak_ptr_factory_; // Tracks FaviconService tasks. - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; // The Profile object is used to listen for events Profile* profile_; @@ -247,7 +247,7 @@ class JumpList : public TabRestoreServiceObserver, // Id of last favicon task. It's used to cancel current task if a new one // comes in before it finishes. - CancelableTaskTracker::TaskId task_id_; + base::CancelableTaskTracker::TaskId task_id_; // Lock for most_visited_pages_, recently_closed_pages_, icon_urls_ // as they may be used by up to 3 threads. diff --git a/chrome/browser/notifications/message_center_settings_controller.cc b/chrome/browser/notifications/message_center_settings_controller.cc index 6493613..d2148a8 100644 --- a/chrome/browser/notifications/message_center_settings_controller.cc +++ b/chrome/browser/notifications/message_center_settings_controller.cc @@ -10,6 +10,7 @@ #include "base/i18n/string_compare.h" #include "base/message_loop/message_loop_proxy.h" #include "base/strings/utf_string_conversions.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/app_icon_loader_impl.h" @@ -24,7 +25,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/common/cancelable_task_tracker.h" #include "chrome/common/extensions/api/notifications.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/favicon/favicon_types.h" @@ -258,7 +258,7 @@ void MessageCenterSettingsController::GetNotifierList( notification_service->GetNotificationsSettings(&settings); FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(profile, Profile::EXPLICIT_ACCESS); - favicon_tracker_.reset(new CancelableTaskTracker()); + favicon_tracker_.reset(new base::CancelableTaskTracker()); patterns_.clear(); for (ContentSettingsForOneType::const_iterator iter = settings.begin(); iter != settings.end(); ++iter) { diff --git a/chrome/browser/notifications/message_center_settings_controller.h b/chrome/browser/notifications/message_center_settings_controller.h index d24a020..7f2bc19 100644 --- a/chrome/browser/notifications/message_center_settings_controller.h +++ b/chrome/browser/notifications/message_center_settings_controller.h @@ -25,10 +25,13 @@ #include "chrome/browser/chromeos/login/user_manager.h" #endif -class CancelableTaskTracker; class Profile; class ProfileInfoCache; +namespace base { +class CancelableTaskTracker; +} + namespace chrome { struct FaviconImageResult; } @@ -106,7 +109,7 @@ class MessageCenterSettingsController ObserverList<message_center::NotifierSettingsObserver> observers_; // The task tracker for loading favicons. - scoped_ptr<CancelableTaskTracker> favicon_tracker_; + scoped_ptr<base::CancelableTaskTracker> favicon_tracker_; scoped_ptr<extensions::AppIconLoader> app_icon_loader_; diff --git a/chrome/browser/password_manager/password_store_consumer.h b/chrome/browser/password_manager/password_store_consumer.h index 4ac5f58..4d4e8c1 100644 --- a/chrome/browser/password_manager/password_store_consumer.h +++ b/chrome/browser/password_manager/password_store_consumer.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_CONSUMER_H_ #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_CONSUMER_H_ -#include "chrome/common/cancelable_task_tracker.h" +#include "base/task/cancelable_task_tracker.h" namespace autofill { struct PasswordForm; @@ -14,8 +14,8 @@ struct PasswordForm; // Reads from the PasswordStore are done asynchronously on a separate // thread. PasswordStoreConsumer provides the virtual callback method, which is // guaranteed to be executed on this (the UI) thread. It also provides the -// CancelableTaskTracker member, which cancels any outstanding tasks upon -// destruction. +// base::CancelableTaskTracker member, which cancels any outstanding +// tasks upon destruction. class PasswordStoreConsumer { public: PasswordStoreConsumer(); @@ -26,9 +26,9 @@ class PasswordStoreConsumer { virtual void OnGetPasswordStoreResults( const std::vector<autofill::PasswordForm*>& results) = 0; - // The CancelableTaskTracker can be used for cancelling the tasks associated - // with the consumer. - CancelableTaskTracker* cancelable_task_tracker() { + // The base::CancelableTaskTracker can be used for cancelling the + // tasks associated with the consumer. + base::CancelableTaskTracker* cancelable_task_tracker() { return &cancelable_task_tracker_; } @@ -40,7 +40,7 @@ class PasswordStoreConsumer { virtual ~PasswordStoreConsumer(); private: - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; base::WeakPtrFactory<PasswordStoreConsumer> weak_ptr_factory_; }; diff --git a/chrome/browser/sessions/base_session_service.cc b/chrome/browser/sessions/base_session_service.cc index 7948d13..a07fd98 100644 --- a/chrome/browser/sessions/base_session_service.cc +++ b/chrome/browser/sessions/base_session_service.cc @@ -43,7 +43,7 @@ void WriteStringToPickle(Pickle& pickle, int* bytes_written, int max_bytes, // Helper used by ScheduleGetLastSessionCommands. It runs callback on TaskRunner // thread if it's not canceled. void RunIfNotCanceled( - const CancelableTaskTracker::IsCanceledCallback& is_canceled, + const base::CancelableTaskTracker::IsCanceledCallback& is_canceled, const BaseSessionService::InternalGetCommandsCallback& callback, ScopedVector<SessionCommand> commands) { if (is_canceled.Run()) @@ -272,12 +272,13 @@ bool BaseSessionService::ShouldTrackEntry(const GURL& url) { url.host() == chrome::kChromeUIRestartHost)); } -CancelableTaskTracker::TaskId - BaseSessionService::ScheduleGetLastSessionCommands( +base::CancelableTaskTracker::TaskId +BaseSessionService::ScheduleGetLastSessionCommands( const InternalGetCommandsCallback& callback, - CancelableTaskTracker* tracker) { - CancelableTaskTracker::IsCanceledCallback is_canceled; - CancelableTaskTracker::TaskId id = tracker->NewTrackedTaskId(&is_canceled); + base::CancelableTaskTracker* tracker) { + base::CancelableTaskTracker::IsCanceledCallback is_canceled; + base::CancelableTaskTracker::TaskId id = + tracker->NewTrackedTaskId(&is_canceled); InternalGetCommandsCallback run_if_not_canceled = base::Bind(&RunIfNotCanceled, is_canceled, callback); diff --git a/chrome/browser/sessions/base_session_service.h b/chrome/browser/sessions/base_session_service.h index db94837..8f49e99 100644 --- a/chrome/browser/sessions/base_session_service.h +++ b/chrome/browser/sessions/base_session_service.h @@ -13,10 +13,10 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" +#include "base/task/cancelable_task_tracker.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/browser/sessions/session_id.h" -#include "chrome/common/cancelable_task_tracker.h" #include "url/gurl.h" class Profile; @@ -151,9 +151,9 @@ class BaseSessionService : public CancelableRequestProvider { // Invokes SessionBackend::ReadLastSessionCommands with callback on the // backend thread. // If testing, SessionBackend::ReadLastSessionCommands is invoked directly. - CancelableTaskTracker::TaskId ScheduleGetLastSessionCommands( + base::CancelableTaskTracker::TaskId ScheduleGetLastSessionCommands( const InternalGetCommandsCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker* tracker); // This posts the task to the SequencedWorkerPool, or run immediately // if the SequencedWorkerPool has been shutdown. diff --git a/chrome/browser/sessions/persistent_tab_restore_service.cc b/chrome/browser/sessions/persistent_tab_restore_service.cc index 0aa9c3c..e9feebb 100644 --- a/chrome/browser/sessions/persistent_tab_restore_service.cc +++ b/chrome/browser/sessions/persistent_tab_restore_service.cc @@ -15,6 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_vector.h" #include "base/stl_util.h" +#include "base/task/cancelable_task_tracker.h" #include "base/time/time.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/browser/profiles/profile.h" @@ -23,7 +24,6 @@ #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sessions/session_service_factory.h" #include "chrome/browser/sessions/tab_restore_service_factory.h" -#include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/session_storage_namespace.h" namespace { @@ -231,7 +231,7 @@ class PersistentTabRestoreService::Delegate ScopedVector<Entry> staging_entries_; // Used when loading previous tabs/session and open tabs/session. - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; DISALLOW_COPY_AND_ASSIGN(Delegate); }; diff --git a/chrome/browser/sessions/session_backend.cc b/chrome/browser/sessions/session_backend.cc index ca12051..e398d36 100644 --- a/chrome/browser/sessions/session_backend.cc +++ b/chrome/browser/sessions/session_backend.cc @@ -244,7 +244,7 @@ void SessionBackend::AppendCommands( } void SessionBackend::ReadLastSessionCommands( - const CancelableTaskTracker::IsCanceledCallback& is_canceled, + const base::CancelableTaskTracker::IsCanceledCallback& is_canceled, const BaseSessionService::InternalGetCommandsCallback& callback) { if (is_canceled.Run()) return; diff --git a/chrome/browser/sessions/session_backend.h b/chrome/browser/sessions/session_backend.h index ca1411f..70eb182 100644 --- a/chrome/browser/sessions/session_backend.h +++ b/chrome/browser/sessions/session_backend.h @@ -9,9 +9,9 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/sessions/base_session_service.h" #include "chrome/browser/sessions/session_command.h" -#include "chrome/common/cancelable_task_tracker.h" namespace net { class FileStream; @@ -67,7 +67,7 @@ class SessionBackend : public base::RefCountedThreadSafe<SessionBackend> { // Invoked from the service to read the commands that make up the last // session, invokes ReadLastSessionCommandsImpl to do the work. void ReadLastSessionCommands( - const CancelableTaskTracker::IsCanceledCallback& is_canceled, + const base::CancelableTaskTracker::IsCanceledCallback& is_canceled, const BaseSessionService::InternalGetCommandsCallback& callback); // Reads the commands from the last file. diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index e6e4af4..f44a89f 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc @@ -19,6 +19,7 @@ #include "base/platform_file.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" @@ -35,7 +36,6 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" -#include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/dom_storage_context.h" #include "content/public/browser/navigation_controller.h" @@ -1156,7 +1156,7 @@ class SessionRestoreImpl : public content::NotificationObserver { std::vector<GURL> urls_to_open_; // Used to get the session. - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; // Responsible for loading the tabs. scoped_refptr<TabLoader> tab_loader_; diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc index 5655a97..d2b0967 100644 --- a/chrome/browser/sessions/session_service.cc +++ b/chrome/browser/sessions/session_service.cc @@ -497,9 +497,9 @@ void SessionService::SetTabUserAgentOverride( kCommandSetTabUserAgentOverride, tab_id.id(), user_agent_override)); } -CancelableTaskTracker::TaskId SessionService::GetLastSession( +base::CancelableTaskTracker::TaskId SessionService::GetLastSession( const SessionCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { // OnGotSessionCommands maps the SessionCommands to browser state, then run // the callback. return ScheduleGetLastSessionCommands( diff --git a/chrome/browser/sessions/session_service.h b/chrome/browser/sessions/session_service.h index 5a7e41d..215083c 100644 --- a/chrome/browser/sessions/session_service.h +++ b/chrome/browser/sessions/session_service.h @@ -11,6 +11,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/memory/scoped_vector.h" +#include "base/task/cancelable_task_tracker.h" #include "base/time/time.h" #include "chrome/browser/defaults.h" #include "chrome/browser/sessions/base_session_service.h" @@ -18,7 +19,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_list_observer.h" -#include "chrome/common/cancelable_task_tracker.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -193,8 +193,9 @@ class SessionService : public BaseSessionService, // Fetches the contents of the last session, notifying the callback when // done. If the callback is supplied an empty vector of SessionWindows // it means the session could not be restored. - CancelableTaskTracker::TaskId GetLastSession(const SessionCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker::TaskId GetLastSession( + const SessionCallback& callback, + base::CancelableTaskTracker* tracker); // Overridden from BaseSessionService because we want some UMA reporting on // session update activities. diff --git a/chrome/browser/sync/glue/favicon_cache.cc b/chrome/browser/sync/glue/favicon_cache.cc index f250d9b..7c9256b 100644 --- a/chrome/browser/sync/glue/favicon_cache.cc +++ b/chrome/browser/sync/glue/favicon_cache.cc @@ -467,11 +467,12 @@ void FaviconCache::OnPageFaviconUpdated(const GURL& page_url) { // TODO(zea): This appears to only fetch one favicon (best match based on // desired_size_in_dip). Figure out a way to fetch all favicons we support. // See crbug.com/181068. - CancelableTaskTracker::TaskId id = favicon_service->GetFaviconForURL( - FaviconService::FaviconForURLParams(page_url, SupportedFaviconTypes(), - kMaxFaviconResolution), + base::CancelableTaskTracker::TaskId id = favicon_service->GetFaviconForURL( + FaviconService::FaviconForURLParams( + page_url, SupportedFaviconTypes(), kMaxFaviconResolution), base::Bind(&FaviconCache::OnFaviconDataAvailable, - weak_ptr_factory_.GetWeakPtr(), page_url), + weak_ptr_factory_.GetWeakPtr(), + page_url), &cancelable_task_tracker_); page_task_map_[page_url] = id; } diff --git a/chrome/browser/sync/glue/favicon_cache.h b/chrome/browser/sync/glue/favicon_cache.h index 964f034..3437ffd 100644 --- a/chrome/browser/sync/glue/favicon_cache.h +++ b/chrome/browser/sync/glue/favicon_cache.h @@ -15,9 +15,9 @@ #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/sessions/session_id.h" -#include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "sync/api/sync_change.h" @@ -117,7 +117,7 @@ class FaviconCache : public syncer::SyncableService, typedef std::set<linked_ptr<SyncedFaviconInfo>, FaviconRecencyFunctor> RecencySet; // Map of page url to task id (for favicon loading). - typedef std::map<GURL, CancelableTaskTracker::TaskId> PageTaskMap; + typedef std::map<GURL, base::CancelableTaskTracker::TaskId> PageTaskMap; // Map of page url to favicon url. typedef std::map<GURL, GURL> PageFaviconMap; @@ -194,7 +194,7 @@ class FaviconCache : public syncer::SyncableService, size_t NumTasksForTest() const; // Trask tracker for loading favicons. - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; // Our actual cached favicon data. FaviconMap synced_favicons_; diff --git a/chrome/browser/ui/android/navigation_popup.h b/chrome/browser/ui/android/navigation_popup.h index da3e222..816eb7a 100644 --- a/chrome/browser/ui/android/navigation_popup.h +++ b/chrome/browser/ui/android/navigation_popup.h @@ -9,7 +9,7 @@ #include "base/android/jni_helper.h" #include "base/basictypes.h" -#include "chrome/common/cancelable_task_tracker.h" +#include "base/task/cancelable_task_tracker.h" class GURL; @@ -37,7 +37,7 @@ class NavigationPopup { private: JavaObjectWeakGlobalRef weak_jobject_; - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; DISALLOW_COPY_AND_ASSIGN(NavigationPopup); }; diff --git a/chrome/browser/ui/cocoa/download/download_item_mac.h b/chrome/browser/ui/cocoa/download/download_item_mac.h index 6d77801..7a576ce 100644 --- a/chrome/browser/ui/cocoa/download/download_item_mac.h +++ b/chrome/browser/ui/cocoa/download/download_item_mac.h @@ -7,9 +7,9 @@ #import <Cocoa/Cocoa.h> +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/icon_manager.h" -#include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" @@ -52,7 +52,7 @@ class DownloadItemMac : content::DownloadItem::Observer { DownloadItemController* item_controller_; // weak, owns us. // For canceling an in progress icon request. - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; // Stores the last known path where the file will be saved. base::FilePath lastFilePath_; diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.h b/chrome/browser/ui/cocoa/history_menu_bridge.h index 91e79af..a1be69b 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.h +++ b/chrome/browser/ui/cocoa/history_menu_bridge.h @@ -11,6 +11,7 @@ #include "base/mac/scoped_nsobject.h" #include "base/memory/ref_counted.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/common/cancelable_request.h" #import "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/history/history_service.h" @@ -18,7 +19,6 @@ #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/sessions/tab_restore_service_observer.h" #import "chrome/browser/ui/cocoa/main_menu_item.h" -#include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/notification_observer.h" class NotificationRegistrar; @@ -79,10 +79,11 @@ class HistoryMenuBridge : public content::NotificationObserver, // If the icon is being requested from the FaviconService, |icon_requested| // will be true and |icon_task_id| will be valid. If this is false, then - // |icon_task_id| will be CancelableTaskTracker::kBadTaskId. + // |icon_task_id| will be + // base::CancelableTaskTracker::kBadTaskId. bool icon_requested; // The Handle given to us by the FaviconService for the icon fetch request. - CancelableTaskTracker::TaskId icon_task_id; + base::CancelableTaskTracker::TaskId icon_task_id; // The pointer to the item after it has been created. Strong; NSMenu also // retains this. During a rebuild flood (if the user closes a lot of tabs @@ -212,7 +213,7 @@ class HistoryMenuBridge : public content::NotificationObserver, content::NotificationRegistrar registrar_; CancelableRequestConsumer cancelable_request_consumer_; - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; // Mapping of NSMenuItems to HistoryItems. This owns the HistoryItems until // they are removed and deleted via ClearMenuSection(). diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm index 1da19c9..3bae9db 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm @@ -55,20 +55,18 @@ const unsigned int kRecentlyClosedCount = 10; } // namespace HistoryMenuBridge::HistoryItem::HistoryItem() - : icon_requested(false), - icon_task_id(CancelableTaskTracker::kBadTaskId), - menu_item(nil), - session_id(0) { -} + : icon_requested(false), + icon_task_id(base::CancelableTaskTracker::kBadTaskId), + menu_item(nil), + session_id(0) {} HistoryMenuBridge::HistoryItem::HistoryItem(const HistoryItem& copy) - : title(copy.title), - url(copy.url), - icon_requested(false), - icon_task_id(CancelableTaskTracker::kBadTaskId), - menu_item(nil), - session_id(copy.session_id) { -} + : title(copy.title), + url(copy.url), + icon_requested(false), + icon_task_id(base::CancelableTaskTracker::kBadTaskId), + menu_item(nil), + session_id(copy.session_id) {} HistoryMenuBridge::HistoryItem::~HistoryItem() { } @@ -458,13 +456,11 @@ HistoryMenuBridge::HistoryItem* HistoryMenuBridge::HistoryItemForTab( void HistoryMenuBridge::GetFaviconForHistoryItem(HistoryItem* item) { FaviconService* service = FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS); - CancelableTaskTracker::TaskId task_id = service->GetFaviconImageForURL( - FaviconService::FaviconForURLParams(item->url, - chrome::FAVICON, - gfx::kFaviconSize), - base::Bind(&HistoryMenuBridge::GotFaviconData, - base::Unretained(this), - item), + base::CancelableTaskTracker::TaskId task_id = service->GetFaviconImageForURL( + FaviconService::FaviconForURLParams( + item->url, chrome::FAVICON, gfx::kFaviconSize), + base::Bind( + &HistoryMenuBridge::GotFaviconData, base::Unretained(this), item), &cancelable_task_tracker_); item->icon_task_id = task_id; item->icon_requested = true; @@ -478,7 +474,7 @@ void HistoryMenuBridge::GotFaviconData( DCHECK(item); item->icon_requested = false; - item->icon_task_id = CancelableTaskTracker::kBadTaskId; + item->icon_task_id = base::CancelableTaskTracker::kBadTaskId; NSImage* image = image_result.image.AsNSImage(); if (image) { @@ -492,6 +488,6 @@ void HistoryMenuBridge::CancelFaviconRequest(HistoryItem* item) { if (item->icon_requested) { cancelable_task_tracker_.TryCancel(item->icon_task_id); item->icon_requested = false; - item->icon_task_id = CancelableTaskTracker::kBadTaskId; + item->icon_task_id = base::CancelableTaskTracker::kBadTaskId; } } diff --git a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm index 2e8c9d2..e226f259 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm @@ -338,7 +338,7 @@ TEST_F(HistoryMenuBridgeTest, GetFaviconForHistoryItem) { // Make sure the item was modified properly. EXPECT_TRUE(item.icon_requested); - EXPECT_NE(CancelableTaskTracker::kBadTaskId, item.icon_task_id); + EXPECT_NE(base::CancelableTaskTracker::kBadTaskId, item.icon_task_id); } TEST_F(HistoryMenuBridgeTest, GotFaviconData) { diff --git a/chrome/browser/ui/gtk/download/download_item_gtk.h b/chrome/browser/ui/gtk/download/download_item_gtk.h index aec4f95..7eb9bd2 100644 --- a/chrome/browser/ui/gtk/download/download_item_gtk.h +++ b/chrome/browser/ui/gtk/download/download_item_gtk.h @@ -12,11 +12,11 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/task/cancelable_task_tracker.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/icon_manager.h" -#include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/download_item.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -232,7 +232,7 @@ class DownloadItemGtk : public content::DownloadItem::Observer, base::Time creation_time_; // For canceling an in progress icon request. - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; // Indicates when the download has completed, so we don't redo // on-completion actions. diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc index 13f227c..ae2a976 100644 --- a/chrome/browser/ui/search_engines/template_url_table_model.cc +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc @@ -9,12 +9,12 @@ #include "base/i18n/rtl.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" -#include "chrome/common/cancelable_task_tracker.h" #include "chrome/common/favicon/favicon_types.h" #include "grit/generated_resources.h" #include "grit/ui_resources.h" @@ -114,7 +114,7 @@ class ModelEntry { gfx::ImageSkia favicon_; LoadState load_state_; TemplateURLTableModel* model_; - CancelableTaskTracker tracker_; + base::CancelableTaskTracker tracker_; DISALLOW_COPY_AND_ASSIGN(ModelEntry); }; diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.h b/chrome/browser/ui/toolbar/back_forward_menu_model.h index 41cecd1..66082ad 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model.h +++ b/chrome/browser/ui/toolbar/back_forward_menu_model.h @@ -11,8 +11,8 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/strings/string16.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/favicon/favicon_service.h" -#include "chrome/common/cancelable_task_tracker.h" #include "ui/base/models/menu_model.h" #include "ui/base/window_open_disposition.h" @@ -204,7 +204,7 @@ class BackForwardMenuModel : public ui::MenuModel { std::set<int> requested_favicons_; // Used for loading favicons. - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; // Used for receiving notifications when an icon is changed. ui::MenuModelDelegate* menu_model_delegate_; diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h index fea3ba9..2e1b5bf 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h @@ -8,11 +8,11 @@ #include <set> #include "base/memory/weak_ptr.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/sessions/tab_restore_service_observer.h" #include "chrome/browser/sync/glue/synced_session.h" -#include "chrome/common/cancelable_task_tracker.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/models/simple_menu_model.h" @@ -159,8 +159,8 @@ class RecentTabsSubMenuModel : public ui::SimpleMenuModel, gfx::Image default_favicon_; - CancelableTaskTracker local_tab_cancelable_task_tracker_; - CancelableTaskTracker other_devices_tab_cancelable_task_tracker_; + base::CancelableTaskTracker local_tab_cancelable_task_tracker_; + base::CancelableTaskTracker other_devices_tab_cancelable_task_tracker_; base::WeakPtrFactory<RecentTabsSubMenuModel> weak_ptr_factory_; diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h index a1c34b1..4b4a9fd 100644 --- a/chrome/browser/ui/views/download/download_item_view.h +++ b/chrome/browser/ui/views/download/download_item_view.h @@ -22,11 +22,11 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_util.h" +#include "base/task/cancelable_task_tracker.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/icon_manager.h" -#include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" #include "ui/gfx/animation/animation_delegate.h" @@ -283,7 +283,7 @@ class DownloadItemView : public views::ButtonListener, gfx::Point drag_start_point_; // For canceling an in progress icon request. - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; // A model class to control the status text we display. DownloadItemModel model_; diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.h b/chrome/browser/ui/webui/extensions/extension_icon_source.h index def0324..b5ea9fd 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.h +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.h @@ -10,8 +10,8 @@ #include "base/basictypes.h" #include "base/memory/weak_ptr.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/favicon/favicon_service.h" -#include "chrome/common/cancelable_task_tracker.h" #include "chrome/common/extensions/extension_icon_set.h" #include "content/public/browser/url_data_source.h" #include "extensions/common/extension_resource.h" @@ -156,7 +156,7 @@ class ExtensionIconSource : public content::URLDataSource, scoped_ptr<SkBitmap> default_extension_data_; - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; DISALLOW_COPY_AND_ASSIGN(ExtensionIconSource); }; diff --git a/chrome/browser/ui/webui/favicon_source.h b/chrome/browser/ui/webui/favicon_source.h index 1d52562..b60b9f2 100644 --- a/chrome/browser/ui/webui/favicon_source.h +++ b/chrome/browser/ui/webui/favicon_source.h @@ -10,8 +10,8 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/favicon/favicon_service.h" -#include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/url_data_source.h" #include "ui/gfx/favicon_size.h" @@ -129,7 +129,7 @@ class FaviconSource : public content::URLDataSource { // Sends the default favicon. void SendDefaultResponse(const IconRequest& request); - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; // Raw PNG representations of favicons of each size to show when the favicon // database doesn't have a favicon for a webpage. Indexed by IconSize values. diff --git a/chrome/browser/ui/webui/fileicon_source.h b/chrome/browser/ui/webui/fileicon_source.h index c5a73ea..54b15fe 100644 --- a/chrome/browser/ui/webui/fileicon_source.h +++ b/chrome/browser/ui/webui/fileicon_source.h @@ -8,8 +8,8 @@ #include <string> #include "base/files/file_path.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/icon_manager.h" -#include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/url_data_source.h" #include "ui/base/layout.h" @@ -62,7 +62,7 @@ class FileIconSource : public content::URLDataSource { gfx::Image* icon); // Tracks tasks requesting file icons. - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; DISALLOW_COPY_AND_ASSIGN(FileIconSource); }; diff --git a/chrome/browser/ui/webui/help/help_handler.h b/chrome/browser/ui/webui/help/help_handler.h index 206f535..67562b9 100644 --- a/chrome/browser/ui/webui/help/help_handler.h +++ b/chrome/browser/ui/webui/help/help_handler.h @@ -94,7 +94,7 @@ class HelpHandler : public content::WebUIMessageHandler, chromeos::VersionLoader loader_; // Used to request the version. - CancelableTaskTracker tracker_; + base::CancelableTaskTracker tracker_; #endif // defined(OS_CHROMEOS) // Used for callbacks. diff --git a/chrome/browser/ui/webui/history_ui.h b/chrome/browser/ui/webui/history_ui.h index df2431a..ebe4c5c 100644 --- a/chrome/browser/ui/webui/history_ui.h +++ b/chrome/browser/ui/webui/history_ui.h @@ -8,12 +8,12 @@ #include <string> #include "base/strings/string16.h" +#include "base/task/cancelable_task_tracker.h" #include "base/timer/timer.h" #include "base/values.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/web_history_service.h" -#include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_ui_controller.h" #include "content/public/browser/web_ui_message_handler.h" @@ -186,7 +186,7 @@ class BrowsingHistoryHandler : public content::WebUIMessageHandler, scoped_ptr<history::WebHistoryService::Request> web_history_delete_request_; // Tracker for delete requests to the history service. - CancelableTaskTracker delete_task_tracker_; + base::CancelableTaskTracker delete_task_tracker_; // The list of URLs that are in the process of being deleted. std::set<GURL> urls_to_be_deleted_; diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index 5b1ed0e..5644882 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -26,6 +26,7 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "base/task/cancelable_task_tracker.h" #include "base/threading/worker_pool.h" #include "base/values.h" #include "chrome/browser/browser_process.h" @@ -42,7 +43,6 @@ #include "chrome/browser/prerender/prerender_manager_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/extensions/extension_basic_info.h" -#include "chrome/common/cancelable_task_tracker.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/logging_chrome.h" @@ -443,9 +443,9 @@ class NetInternalsMessageHandler scoped_ptr<chromeos::system::LogDictionaryType> logs_; bool logs_received_; bool logs_requested_; - CancelableTaskTracker tracker_; + base::CancelableTaskTracker tracker_; // Libcros request task ID. - CancelableTaskTracker::TaskId syslogs_task_id_; + base::CancelableTaskTracker::TaskId syslogs_task_id_; }; #endif // defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/webui/ntp/android/bookmarks_handler.h b/chrome/browser/ui/webui/ntp/android/bookmarks_handler.h index 23e4669..978f17f 100644 --- a/chrome/browser/ui/webui/ntp/android/bookmarks_handler.h +++ b/chrome/browser/ui/webui/ntp/android/bookmarks_handler.h @@ -6,12 +6,12 @@ #define CHROME_BROWSER_UI_WEBUI_NTP_ANDROID_BOOKMARKS_HANDLER_H_ #include "base/memory/scoped_ptr.h" +#include "base/task/cancelable_task_tracker.h" #include "base/values.h" #include "chrome/browser/android/bookmarks/managed_bookmarks_shim.h" #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" #include "chrome/browser/bookmarks/base_bookmark_model_observer.h" #include "chrome/browser/favicon/favicon_service.h" -#include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/web_ui_message_handler.h" // The handler for Javascript messages related to the bookmarks. @@ -109,7 +109,7 @@ class BookmarksHandler : public content::WebUIMessageHandler, bool extensive_changes_; // Used for loading bookmark node. - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; // Returns true iff bookmark model and partner bookmarks shim are loaded. bool AreModelsLoaded() const; diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.h b/chrome/browser/ui/webui/ntp/app_launcher_handler.h index e0903e3..4552d39 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.h +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.h @@ -11,10 +11,10 @@ #include "apps/metrics_names.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_change_registrar.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/extensions/extension_uninstall_dialog.h" #include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h" -#include "chrome/common/cancelable_task_tracker.h" #include "chrome/common/extensions/extension_constants.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -189,7 +189,7 @@ class AppLauncherHandler : public content::WebUIMessageHandler, std::string highlight_app_id_; // Used for favicon loading tasks. - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; DISALLOW_COPY_AND_ASSIGN(AppLauncherHandler); }; diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.h b/chrome/browser/ui/webui/ntp/favicon_webui_handler.h index 1fa5521..dd28fb1 100644 --- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.h +++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.h @@ -10,8 +10,8 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/favicon/favicon_service.h" -#include "chrome/common/cancelable_task_tracker.h" #include "content/public/browser/web_ui_message_handler.h" class ExtensionIconColorManager; @@ -45,7 +45,7 @@ class FaviconWebUIHandler : public content::WebUIMessageHandler { FaviconService::Handle request_handle, const chrome::FaviconBitmapResult& bitmap_result); - CancelableTaskTracker cancelable_task_tracker_; + base::CancelableTaskTracker cancelable_task_tracker_; // Map from request ID to DOM ID so we can make the appropriate callback when // the favicon request comes back. This map exists because diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc index 5d230b0..4034c70 100644 --- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc +++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc @@ -205,13 +205,15 @@ class FileAccessProvider // parameter is the number of bytes written on success. typedef base::Callback<void(const int*, const int*)> WriteCallback; - CancelableTaskTracker::TaskId StartRead(const base::FilePath& path, - const ReadCallback& callback, - CancelableTaskTracker* tracker); - CancelableTaskTracker::TaskId StartWrite(const base::FilePath& path, - const std::string& data, - const WriteCallback& callback, - CancelableTaskTracker* tracker); + base::CancelableTaskTracker::TaskId StartRead( + const base::FilePath& path, + const ReadCallback& callback, + base::CancelableTaskTracker* tracker); + base::CancelableTaskTracker::TaskId StartWrite( + const base::FilePath& path, + const std::string& data, + const WriteCallback& callback, + base::CancelableTaskTracker* tracker); private: friend class base::RefCountedThreadSafe<FileAccessProvider>; @@ -230,10 +232,10 @@ class FileAccessProvider int* bytes_written); }; -CancelableTaskTracker::TaskId FileAccessProvider::StartRead( +base::CancelableTaskTracker::TaskId FileAccessProvider::StartRead( const base::FilePath& path, const ReadCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { // Owned by reply callback posted below. int* saved_errno = new int(0); std::string* data = new std::string(); @@ -246,11 +248,11 @@ CancelableTaskTracker::TaskId FileAccessProvider::StartRead( base::Bind(callback, base::Owned(saved_errno), base::Owned(data))); } -CancelableTaskTracker::TaskId FileAccessProvider::StartWrite( +base::CancelableTaskTracker::TaskId FileAccessProvider::StartWrite( const base::FilePath& path, const std::string& data, const WriteCallback& callback, - CancelableTaskTracker* tracker) { + base::CancelableTaskTracker* tracker) { // Owned by reply callback posted below. int* saved_errno = new int(0); int* bytes_written = new int(0); diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.h b/chrome/browser/ui/webui/options/certificate_manager_handler.h index bd739fe..b8a027ba 100644 --- a/chrome/browser/ui/webui/options/certificate_manager_handler.h +++ b/chrome/browser/ui/webui/options/certificate_manager_handler.h @@ -10,9 +10,9 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/certificate_manager_model.h" #include "chrome/browser/ui/webui/options/options_ui.h" -#include "chrome/common/cancelable_task_tracker.h" #include "net/cert/nss_cert_database.h" #include "ui/gfx/native_widget_types.h" #include "ui/shell_dialogs/select_file_dialog.h" @@ -175,7 +175,7 @@ class CertificateManagerHandler scoped_refptr<net::CryptoModule> module_; // Used in reading and writing certificate files. - CancelableTaskTracker tracker_; + base::CancelableTaskTracker tracker_; scoped_refptr<FileAccessProvider> file_access_provider_; scoped_ptr<CertIdMap> cert_id_map_; diff --git a/chrome/browser/ui/webui/version_handler_chromeos.h b/chrome/browser/ui/webui/version_handler_chromeos.h index f87bd03..ef78423 100644 --- a/chrome/browser/ui/webui/version_handler_chromeos.h +++ b/chrome/browser/ui/webui/version_handler_chromeos.h @@ -28,7 +28,7 @@ class VersionHandlerChromeOS : public VersionHandler { chromeos::VersionLoader loader_; // Used to request the version. - CancelableTaskTracker tracker_; + base::CancelableTaskTracker tracker_; DISALLOW_COPY_AND_ASSIGN(VersionHandlerChromeOS); }; diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index da9ab4e..652ec98 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -67,8 +67,6 @@ 'common/automation_messages_internal.h', 'common/badge_util.cc', 'common/badge_util.h', - 'common/cancelable_task_tracker.cc', - 'common/cancelable_task_tracker.h', 'common/child_process_logging.h', 'common/child_process_logging_win.cc', 'common/chrome_content_client.cc', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index c4b3286..10090ae 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -1781,7 +1781,6 @@ 'browser/web_resource/resource_request_allowed_notifier_unittest.cc', 'browser/webdata/keyword_table_unittest.cc', 'browser/webdata/web_apps_table_unittest.cc', - 'common/cancelable_task_tracker_unittest.cc', 'common/chrome_paths_unittest.cc', 'common/chrome_content_client_unittest.cc', 'common/cloud_print/cloud_print_helpers_unittest.cc', |