Code cleanup

chrome/browser/android/provider/chrome_browser_provider.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_
 #define CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_
 
 #include "base/android/jni_weak_ref.h"
 #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/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"
 #include "content/public/browser/notification_registrar.h"
 
 class AndroidHistoryProviderService;
 class FaviconService;
 class Profile;
 
 namespace history {
@@ skipping 163 matching lines @@
 
   JavaObjectWeakGlobalRef weak_java_provider_;
 
   Profile* profile_;
   BookmarkModel* bookmark_model_;
   history::TopSites* top_sites_;
 
   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.
   content::NotificationRegistrar notification_registrar_;
 
   bool handling_extensive_changes_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserProvider);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_PROVIDER_CHROME_BROWSER_PROVIDER_H_