Adding commandline switch and user pref for autofill server url.

chrome/browser/autofill/autofill_download.cc

Index: chrome/browser/autofill/autofill_download.cc
diff --git a/chrome/browser/autofill/autofill_download.cc b/chrome/browser/autofill/autofill_download.cc
index 66a63f22b050d5da38856891089f5d5bac6aa0c7..6553f1cb641bed3986ae436d318092a87a406cd1 100644
--- a/chrome/browser/autofill/autofill_download.cc
+++ b/chrome/browser/autofill/autofill_download.cc
@@ -27,18 +27,8 @@
 using content::BrowserContext;
 
 namespace {
-const char kAutofillQueryServerRequestUrl[] =
-    "https://clients1.google.com/tbproxy/af/query?client=";
-const char kAutofillUploadServerRequestUrl[] =
-    "https://clients1.google.com/tbproxy/af/upload?client=";
 const char kAutofillQueryServerNameStartInHeader[] = "GFE/";
 
-#if defined(GOOGLE_CHROME_BUILD)
-const char kClientName[] = "Google Chrome";
-#else
-const char kClientName[] = "Chromium";
-#endif  // defined(GOOGLE_CHROME_BUILD)
-
 const size_t kMaxFormCacheSize = 16;
 };
 
@@ -60,6 +50,7 @@ AutofillDownloadManager::AutofillDownloadManager(BrowserContext* context,
   DCHECK(observer_);
   PrefServiceBase* preferences =
       PrefServiceBase::FromBrowserContext(browser_context_);
+  autofill_download_url_ = new AutofillDownloadUrl(preferences);

[Ilya Sherman, 2012/10/23 23:45:13]

This will leak...

[Albert Bodenhamer, 2012/10/23 23:57:11]

Currently there's a leak here.  Most consumers of classes like this allocate
them on the stack.

[ahutter, 2012/10/24 17:33:45]

Done.

   positive_upload_rate_ =
       preferences->GetDouble(prefs::kAutofillPositiveUploadRate);
   negative_upload_rate_ =
@@ -168,17 +159,16 @@ bool AutofillDownloadManager::StartRequest(
   net::URLRequestContextGetter* request_context =
       browser_context_->GetRequestContext();
   DCHECK(request_context);
-  std::string request_url;
+  GURL request_url;
   if (request_data.request_type == AutofillDownloadManager::REQUEST_QUERY)
-    request_url = kAutofillQueryServerRequestUrl;
+    request_url = autofill_download_url_->GetAutofillRequestUrl();
   else
-    request_url = kAutofillUploadServerRequestUrl;
-  request_url += kClientName;
+    request_url = autofill_download_url_->GetAutofillUploadUrl();
 
   // Id is ignored for regular chrome, in unit test id's for fake fetcher
   // factory will be 0, 1, 2, ...
   net::URLFetcher* fetcher = net::URLFetcher::Create(
-      fetcher_id_for_unittest_++, GURL(request_url), net::URLFetcher::POST,
+      fetcher_id_for_unittest_++, request_url, net::URLFetcher::POST,
       this);
   url_fetchers_[fetcher] = request_data;
   fetcher->SetAutomaticallyRetryOn5xx(false);