summaryrefslogtreecommitdiffstats
path: root/chrome/browser/google/google_util.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-09 00:24:38 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-09 00:24:38 +0000
commit665fa0122d3d38e6f6df6850f3037f4e2d7a2e3e (patch)
tree5dc1d2ea3228b6260737fc184d731899cf5eff58 /chrome/browser/google/google_util.cc
parentdf7d301334a4b275f0b9321cadcfecccc244210b (diff)
downloadchromium_src-665fa0122d3d38e6f6df6850f3037f4e2d7a2e3e.zip
chromium_src-665fa0122d3d38e6f6df6850f3037f4e2d7a2e3e.tar.gz
chromium_src-665fa0122d3d38e6f6df6850f3037f4e2d7a2e3e.tar.bz2
Make GoogleURLTracker a profile-keyed service.
The original multi-profile work made this object use the system request context, which meant it never sent cookies to searchdomaincheck. This is bad because these are important to determining the correct domain to reply with. Instead, there should be a different instance per-profile, and these instances should use the standard Profile-scoped cookie stores, so we send the relevant google.com cookies. BUG=106086 TEST=Requests to searchdomaincheck should send cookies. Review URL: https://chromiumcodereview.appspot.com/10377054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/google/google_util.cc')
-rw-r--r--chrome/browser/google/google_util.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/google/google_util.cc b/chrome/browser/google/google_util.cc
index 22b17fc..e0edd2b 100644
--- a/chrome/browser/google/google_util.cc
+++ b/chrome/browser/google/google_util.cc
@@ -76,10 +76,10 @@ std::string StringAppendGoogleLocaleParam(const std::string& url) {
return localized_url.spec();
}
-GURL AppendGoogleTLDParam(const GURL& url) {
+GURL AppendGoogleTLDParam(Profile* profile, const GURL& url) {
const std::string google_domain(
net::RegistryControlledDomainService::GetDomainAndRegistry(
- GoogleURLTracker::GoogleURL()));
+ GoogleURLTracker::GoogleURL(profile)));
const size_t first_dot = google_domain.find('.');
if (first_dot == std::string::npos) {
NOTREACHED();