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/protocol_manager_helper.h" | 5 #include "chrome/browser/safe_browsing/protocol_manager_helper.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/stl_util.h" | 12 #include "base/stl_util.h" |
13 #include "base/string_util.h" | 13 #include "base/string_util.h" |
14 #include "base/stringprintf.h" | 14 #include "base/stringprintf.h" |
15 #include "chrome/common/chrome_version_info.h" | 15 #include "chrome/common/chrome_version_info.h" |
16 #include "chrome/common/env_vars.h" | 16 #include "chrome/common/env_vars.h" |
17 #include "content/public/browser/browser_thread.h" | |
18 #include "google_apis/google_api_keys.h" | 17 #include "google_apis/google_api_keys.h" |
19 #include "net/base/escape.h" | 18 #include "net/base/escape.h" |
20 | 19 |
21 SafeBrowsingProtocolConfig::SafeBrowsingProtocolConfig() | 20 SafeBrowsingProtocolConfig::SafeBrowsingProtocolConfig() |
22 : disable_auto_update(false) { | 21 : disable_auto_update(false) { |
23 } | 22 } |
24 | 23 |
25 SafeBrowsingProtocolConfig::~SafeBrowsingProtocolConfig() { | 24 SafeBrowsingProtocolConfig::~SafeBrowsingProtocolConfig() { |
26 } | 25 } |
27 | 26 |
(...skipping 21 matching lines...) Expand all Loading... |
49 base::StringAppendF(&url, "&key=%s", | 48 base::StringAppendF(&url, "&key=%s", |
50 net::EscapeQueryParamValue(api_key, true).c_str()); | 49 net::EscapeQueryParamValue(api_key, true).c_str()); |
51 } | 50 } |
52 if (!additional_query.empty()) { | 51 if (!additional_query.empty()) { |
53 DCHECK(url.find("?") != std::string::npos); | 52 DCHECK(url.find("?") != std::string::npos); |
54 url.append("&"); | 53 url.append("&"); |
55 url.append(additional_query); | 54 url.append(additional_query); |
56 } | 55 } |
57 return url; | 56 return url; |
58 } | 57 } |
OLD | NEW |