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

Side by Side Diff: components/google/core/browser/google_url_tracker.cc

Issue 1493503002: base: get rid of deprecated TrimWhitespace() function (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE Created 5 years 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/google/core/browser/google_url_tracker.h" 5 #include "components/google/core/browser/google_url_tracker.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 90
91 // Don't update the URL if the request didn't succeed. 91 // Don't update the URL if the request didn't succeed.
92 if (!source->GetStatus().is_success() || (source->GetResponseCode() != 200)) { 92 if (!source->GetStatus().is_success() || (source->GetResponseCode() != 200)) {
93 already_fetched_ = false; 93 already_fetched_ = false;
94 return; 94 return;
95 } 95 }
96 96
97 // See if the response data was valid. It should be ".google.<TLD>". 97 // See if the response data was valid. It should be ".google.<TLD>".
98 std::string url_str; 98 std::string url_str;
99 source->GetResponseAsString(&url_str); 99 source->GetResponseAsString(&url_str);
100 base::TrimWhitespace(url_str, base::TRIM_ALL, &url_str); 100 base::TrimWhitespaceASCII(url_str, base::TRIM_ALL, &url_str);
101 if (!base::StartsWith(url_str, ".google.", 101 if (!base::StartsWith(url_str, ".google.",
102 base::CompareCase::INSENSITIVE_ASCII)) 102 base::CompareCase::INSENSITIVE_ASCII))
103 return; 103 return;
104 GURL url("https://www" + url_str); 104 GURL url("https://www" + url_str);
105 if (!url.is_valid() || (url.path().length() > 1) || url.has_query() || 105 if (!url.is_valid() || (url.path().length() > 1) || url.has_query() ||
106 url.has_ref() || 106 url.has_ref() ||
107 !google_util::IsGoogleDomainUrl(url, google_util::DISALLOW_SUBDOMAIN, 107 !google_util::IsGoogleDomainUrl(url, google_util::DISALLOW_SUBDOMAIN,
108 google_util::DISALLOW_NON_STANDARD_PORTS)) 108 google_util::DISALLOW_NON_STANDARD_PORTS))
109 return; 109 return;
110 110
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 // Also retry kMaxRetries times on network change errors. A network change can 181 // Also retry kMaxRetries times on network change errors. A network change can
182 // propagate through Chrome in various stages, so it's possible for this code 182 // propagate through Chrome in various stages, so it's possible for this code
183 // to be reached via OnNetworkChanged(), and then have the fetch we kick off 183 // to be reached via OnNetworkChanged(), and then have the fetch we kick off
184 // be canceled due to e.g. the DNS server changing at a later time. In general 184 // be canceled due to e.g. the DNS server changing at a later time. In general
185 // it's not possible to ensure that by the time we reach here any requests we 185 // it's not possible to ensure that by the time we reach here any requests we
186 // start won't be canceled in this fashion, so retrying is the best we can do. 186 // start won't be canceled in this fashion, so retrying is the best we can do.
187 fetcher_->SetAutomaticallyRetryOnNetworkChanges(kMaxRetries); 187 fetcher_->SetAutomaticallyRetryOnNetworkChanges(kMaxRetries);
188 188
189 fetcher_->Start(); 189 fetcher_->Start();
190 } 190 }
OLDNEW
« no previous file with comments | « chromeos/dbus/power_policy_controller.cc ('k') | components/plugins/renderer/plugin_placeholder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698