OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/protocol_manager.h" | 5 #include "chrome/browser/safe_browsing/protocol_manager.h" |
6 | 6 |
7 #ifndef NDEBUG | 7 #ifndef NDEBUG |
8 #include "base/base64.h" | 8 #include "base/base64.h" |
9 #endif | 9 #endif |
10 #include "base/environment.h" | 10 #include "base/environment.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
13 #include "base/rand_util.h" | 13 #include "base/rand_util.h" |
14 #include "base/stl_util-inl.h" | 14 #include "base/stl_util-inl.h" |
15 #include "base/string_util.h" | 15 #include "base/string_util.h" |
16 #include "base/task.h" | 16 #include "base/task.h" |
17 #include "base/timer.h" | 17 #include "base/timer.h" |
18 #include "chrome/browser/browser_thread.h" | 18 #include "chrome/browser/browser_thread.h" |
19 #include "chrome/browser/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
20 #include "chrome/browser/safe_browsing/protocol_parser.h" | 20 #include "chrome/browser/safe_browsing/protocol_parser.h" |
21 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 21 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
22 #include "chrome/common/chrome_version_info.h" | 22 #include "chrome/common/chrome_version_info.h" |
23 #include "chrome/common/env_vars.h" | 23 #include "chrome/common/env_vars.h" |
24 #include "chrome/common/net/url_request_context_getter.h" | 24 #include "chrome/common/net/url_request_context_getter.h" |
25 #include "net/base/escape.h" | 25 #include "net/base/escape.h" |
26 #include "net/base/load_flags.h" | 26 #include "net/base/load_flags.h" |
27 #include "net/url_request/url_request_status.h" | 27 #include "net/url_request/url_request_status.h" |
28 | 28 |
29 using base::Time; | 29 using base::Time; |
(...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
716 if (!additional_query_.empty()) { | 716 if (!additional_query_.empty()) { |
717 if (next_url.find("?") != std::string::npos) { | 717 if (next_url.find("?") != std::string::npos) { |
718 next_url.append("&"); | 718 next_url.append("&"); |
719 } else { | 719 } else { |
720 next_url.append("?"); | 720 next_url.append("?"); |
721 } | 721 } |
722 next_url.append(additional_query_); | 722 next_url.append(additional_query_); |
723 } | 723 } |
724 return GURL(next_url); | 724 return GURL(next_url); |
725 } | 725 } |
OLD | NEW |