Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(730)

Side by Side Diff: chrome/browser/safe_browsing/protocol_manager_helper.cc

Issue 634583003: Simplify VersionInfo code, avoid hitting sandbox IPC constantly on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: linux include Created 6 years, 2 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
OLDNEW
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"
(...skipping 13 matching lines...) Expand all
24 #endif 24 #endif
25 { 25 {
26 } 26 }
27 27
28 SafeBrowsingProtocolConfig::~SafeBrowsingProtocolConfig() { 28 SafeBrowsingProtocolConfig::~SafeBrowsingProtocolConfig() {
29 } 29 }
30 30
31 // static 31 // static
32 std::string SafeBrowsingProtocolManagerHelper::Version() { 32 std::string SafeBrowsingProtocolManagerHelper::Version() {
33 chrome::VersionInfo version_info; 33 chrome::VersionInfo version_info;
34 if (!version_info.is_valid() || version_info.Version().empty()) 34 if (version_info.Version().empty())
35 return "0.1"; 35 return "0.1";
36 else 36 else
37 return version_info.Version(); 37 return version_info.Version();
38 } 38 }
39 39
40 // static 40 // static
41 std::string SafeBrowsingProtocolManagerHelper::ComposeUrl( 41 std::string SafeBrowsingProtocolManagerHelper::ComposeUrl(
42 const std::string& prefix, const std::string& method, 42 const std::string& prefix, const std::string& method,
43 const std::string& client_name, const std::string& version, 43 const std::string& client_name, const std::string& version,
44 const std::string& additional_query) { 44 const std::string& additional_query) {
45 DCHECK(!prefix.empty() && !method.empty() && 45 DCHECK(!prefix.empty() && !method.empty() &&
46 !client_name.empty() && !version.empty()); 46 !client_name.empty() && !version.empty());
47 std::string url = base::StringPrintf("%s/%s?client=%s&appver=%s&pver=3.0", 47 std::string url = base::StringPrintf("%s/%s?client=%s&appver=%s&pver=3.0",
48 prefix.c_str(), method.c_str(), 48 prefix.c_str(), method.c_str(),
49 client_name.c_str(), version.c_str()); 49 client_name.c_str(), version.c_str());
50 std::string api_key = google_apis::GetAPIKey(); 50 std::string api_key = google_apis::GetAPIKey();
51 if (!api_key.empty()) { 51 if (!api_key.empty()) {
52 base::StringAppendF(&url, "&key=%s", 52 base::StringAppendF(&url, "&key=%s",
53 net::EscapeQueryParamValue(api_key, true).c_str()); 53 net::EscapeQueryParamValue(api_key, true).c_str());
54 } 54 }
55 if (!additional_query.empty()) { 55 if (!additional_query.empty()) {
56 DCHECK(url.find("?") != std::string::npos); 56 DCHECK(url.find("?") != std::string::npos);
57 url.append("&"); 57 url.append("&");
58 url.append(additional_query); 58 url.append(additional_query);
59 } 59 }
60 return url; 60 return url;
61 } 61 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698