| Index: chrome/browser/safe_browsing/threat_details_history.cc
|
| diff --git a/chrome/browser/safe_browsing/threat_details_history.cc b/chrome/browser/safe_browsing/threat_details_history.cc
|
| deleted file mode 100644
|
| index 4a01578908c8195916df8e084df26ab487ac4043..0000000000000000000000000000000000000000
|
| --- a/chrome/browser/safe_browsing/threat_details_history.cc
|
| +++ /dev/null
|
| @@ -1,123 +0,0 @@
|
| -// 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.
|
| -//
|
| -// Implementation of the ThreatDetailsRedirectsCollector class.
|
| -
|
| -#include "chrome/browser/safe_browsing/threat_details_history.h"
|
| -
|
| -#include <stddef.h>
|
| -
|
| -#include "base/bind.h"
|
| -#include "base/bind_helpers.h"
|
| -#include "chrome/browser/safe_browsing/threat_details.h"
|
| -#include "components/history/core/browser/history_service.h"
|
| -#include "content/public/browser/browser_thread.h"
|
| -#include "content/public/browser/notification_details.h"
|
| -#include "content/public/browser/notification_source.h"
|
| -
|
| -using content::BrowserThread;
|
| -
|
| -namespace safe_browsing {
|
| -
|
| -ThreatDetailsRedirectsCollector::ThreatDetailsRedirectsCollector(
|
| - const base::WeakPtr<history::HistoryService>& history_service)
|
| - : has_started_(false),
|
| - history_service_(history_service),
|
| - history_service_observer_(this) {
|
| - DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| -
|
| - if (history_service) {
|
| - history_service_observer_.Add(history_service.get());
|
| - }
|
| -}
|
| -
|
| -void ThreatDetailsRedirectsCollector::StartHistoryCollection(
|
| - const std::vector<GURL>& urls,
|
| - const base::Closure& callback) {
|
| - DVLOG(1) << "Num of urls to check in history service: " << urls.size();
|
| - has_started_ = true;
|
| - callback_ = callback;
|
| -
|
| - if (urls.size() == 0) {
|
| - AllDone();
|
| - return;
|
| - }
|
| -
|
| - BrowserThread::PostTask(
|
| - BrowserThread::UI, FROM_HERE,
|
| - base::BindOnce(&ThreatDetailsRedirectsCollector::StartGetRedirects, this,
|
| - urls));
|
| -}
|
| -
|
| -bool ThreatDetailsRedirectsCollector::HasStarted() const {
|
| - return has_started_;
|
| -}
|
| -
|
| -const std::vector<RedirectChain>&
|
| -ThreatDetailsRedirectsCollector::GetCollectedUrls() const {
|
| - return redirects_urls_;
|
| -}
|
| -
|
| -ThreatDetailsRedirectsCollector::~ThreatDetailsRedirectsCollector() {}
|
| -
|
| -void ThreatDetailsRedirectsCollector::StartGetRedirects(
|
| - const std::vector<GURL>& urls) {
|
| - // History access from profile needs to happen in UI thread
|
| - DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| - for (size_t i = 0; i < urls.size(); ++i) {
|
| - urls_.push_back(urls[i]);
|
| - }
|
| - urls_it_ = urls_.begin();
|
| - GetRedirects(*urls_it_);
|
| -}
|
| -
|
| -void ThreatDetailsRedirectsCollector::GetRedirects(const GURL& url) {
|
| - DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| -
|
| - if (!history_service_) {
|
| - AllDone();
|
| - return;
|
| - }
|
| -
|
| - history_service_->QueryRedirectsTo(
|
| - url,
|
| - base::Bind(&ThreatDetailsRedirectsCollector::OnGotQueryRedirectsTo,
|
| - base::Unretained(this), url),
|
| - &request_tracker_);
|
| -}
|
| -
|
| -void ThreatDetailsRedirectsCollector::OnGotQueryRedirectsTo(
|
| - const GURL& url,
|
| - const history::RedirectList* redirect_list) {
|
| - if (!redirect_list->empty()) {
|
| - std::vector<GURL> urllist;
|
| - urllist.push_back(url);
|
| - urllist.insert(urllist.end(), redirect_list->begin(), redirect_list->end());
|
| - redirects_urls_.push_back(urllist);
|
| - }
|
| -
|
| - // Proceed to next url
|
| - ++urls_it_;
|
| -
|
| - if (urls_it_ == urls_.end()) {
|
| - AllDone();
|
| - return;
|
| - }
|
| -
|
| - GetRedirects(*urls_it_);
|
| -}
|
| -
|
| -void ThreatDetailsRedirectsCollector::AllDone() {
|
| - DVLOG(1) << "AllDone";
|
| - BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, callback_);
|
| - callback_.Reset();
|
| -}
|
| -
|
| -void ThreatDetailsRedirectsCollector::HistoryServiceBeingDeleted(
|
| - history::HistoryService* history_service) {
|
| - history_service_observer_.Remove(history_service);
|
| - history_service_.reset();
|
| -}
|
| -
|
| -} // namespace safe_browsing
|
|
|