trunk/src/chrome/browser/safe_browsing/download_protection_service.cc - Issue 14985007: Revert 198844 "Move sequenced_task_runner to base/task"

Side by Side Diff: trunk/src/chrome/browser/safe_browsing/download_protection_service.cc

Issue 14985007: Revert 198844 "Move sequenced_task_runner to base/task" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 7 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « trunk/src/chrome/browser/safe_browsing/client_side_detection_host.cc ('k') | trunk/src/chrome/browser/safe_browsing/malware_details_history.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/safe_browsing/download_protection_service.h"	5 #include "chrome/browser/safe_browsing/download_protection_service.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/compiler_specific.h"	8 #include "base/compiler_specific.h"

9 #include "base/format_macros.h"	9 #include "base/format_macros.h"

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

11 #include "base/memory/weak_ptr.h"	11 #include "base/memory/weak_ptr.h"

12 #include "base/metrics/histogram.h"	12 #include "base/metrics/histogram.h"

	13 #include "base/sequenced_task_runner_helpers.h"

13 #include "base/stl_util.h"	14 #include "base/stl_util.h"

14 #include "base/string_util.h"	15 #include "base/string_util.h"

15 #include "base/stringprintf.h"	16 #include "base/stringprintf.h"

16 #include "base/strings/string_number_conversions.h"	17 #include "base/strings/string_number_conversions.h"

17 #include "base/task/sequenced_task_runner_helpers.h"

18 #include "base/threading/sequenced_worker_pool.h"	18 #include "base/threading/sequenced_worker_pool.h"

19 #include "base/time.h"	19 #include "base/time.h"

20 #include "chrome/browser/safe_browsing/safe_browsing_service.h"	20 #include "chrome/browser/safe_browsing/safe_browsing_service.h"

21 #include "chrome/browser/safe_browsing/sandboxed_zip_analyzer.h"	21 #include "chrome/browser/safe_browsing/sandboxed_zip_analyzer.h"

22 #include "chrome/browser/safe_browsing/signature_util.h"	22 #include "chrome/browser/safe_browsing/signature_util.h"

23 #include "chrome/browser/ui/browser.h"	23 #include "chrome/browser/ui/browser.h"

24 #include "chrome/browser/ui/browser_list.h"	24 #include "chrome/browser/ui/browser_list.h"

25 #include "chrome/common/safe_browsing/csd.pb.h"	25 #include "chrome/common/safe_browsing/csd.pb.h"

26 #include "chrome/common/safe_browsing/download_protection_util.h"	26 #include "chrome/common/safe_browsing/download_protection_util.h"

27 #include "chrome/common/safe_browsing/zip_analyzer.h"	27 #include "chrome/common/safe_browsing/zip_analyzer.h"

(...skipping 916 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
944 std::string url = kDownloadRequestUrl;	944 std::string url = kDownloadRequestUrl;

945 std::string api_key = google_apis::GetAPIKey();	945 std::string api_key = google_apis::GetAPIKey();

946 if (!api_key.empty()) {	946 if (!api_key.empty()) {

947 base::StringAppendF(&url, "?key=%s",	947 base::StringAppendF(&url, "?key=%s",

948 net::EscapeQueryParamValue(api_key, true).c_str());	948 net::EscapeQueryParamValue(api_key, true).c_str());

949 }	949 }

950 return url;	950 return url;

951 }	951 }

952	952

953 } // namespace safe_browsing	953 } // namespace safe_browsing

OLD	NEW