Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(718)

Unified Diff: chrome/browser/android/provider/chrome_browser_provider.h

Issue 370603003: Code cleanup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cancelable_task_tracker.7
Patch Set: Rebase Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/android/provider/chrome_browser_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/provider/chrome_browser_provider.h
diff --git a/chrome/browser/android/provider/chrome_browser_provider.h b/chrome/browser/android/provider/chrome_browser_provider.h
index a161f2009d33a8e21807c47994b71c03ad5b3ef7..e8d7320a957ca94c92ce763f93f7a7b928085baf 100644
--- a/chrome/browser/android/provider/chrome_browser_provider.h
+++ b/chrome/browser/android/provider/chrome_browser_provider.h
@@ -10,7 +10,6 @@
#include "base/memory/scoped_ptr.h"
#include "base/synchronization/waitable_event.h"
#include "base/task/cancelable_task_tracker.h"
-#include "chrome/browser/common/cancelable_request.h"
#include "chrome/browser/history/android/android_history_types.h"
#include "components/bookmarks/browser/base_bookmark_model_observer.h"
#include "content/public/browser/notification_observer.h"
@@ -194,14 +193,6 @@ class ChromeBrowserProvider : public BaseBookmarkModelObserver,
scoped_ptr<AndroidHistoryProviderService> service_;
scoped_ptr<FaviconService> favicon_service_;
- // Different cancelable request consumers must be used for each service.
- // This because a synchronization issue that could lead to flaky assertion
- // failures otherwise.
- // TODO(leandrogracia): use a single consumer once http://crbug.com/85970
- // is fixed.
- CancelableRequestConsumer android_history_consumer_;
- CancelableRequestConsumer favicon_consumer_;
-
base::CancelableTaskTracker cancelable_task_tracker_;
// Used to register/unregister notification observer.
« no previous file with comments | « no previous file | chrome/browser/android/provider/chrome_browser_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698