Adding commandline switch and user pref for autofill server url.

chrome/browser/autofill/autofill_download_url.cc

Index: chrome/browser/autofill/autofill_download_url.cc
diff --git a/chrome/browser/autofill/autofill_download_url.cc b/chrome/browser/autofill/autofill_download_url.cc
new file mode 100644
index 0000000000000000000000000000000000000000..357558bc711896ceac84eaa5277d86a3f8936d3e
--- /dev/null
+++ b/chrome/browser/autofill/autofill_download_url.cc
@@ -0,0 +1,55 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/autofill/autofill_download_url.h"
+
+#include "base/command_line.h"
+#include "base/string_util.h"
+#include "chrome/browser/api/prefs/pref_service_base.h"
+#include "chrome/common/chrome_switches.h"
+#include "chrome/common/pref_names.h"
+#include "googleurl/src/gurl.h"
+
+const char kDefaultAutofillServiceUrl[] = "https://clients1.google.com/tbproxy/af/";

[Albert Bodenhamer, 2012/10/23 23:34:17]

80 chars.

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

Done.

+
+#if defined(GOOGLE_CHROME_BUILD)
+const char kClientName[] = "Google Chrome";
+#else
+const char kClientName[] = "Chromium";
+#endif  // defined(GOOGLE_CHROME_BUILD)
+
+void AutofillDownloadUrl::RegisterPreferences() {
+  DCHECK(pref_service_);
+  if (pref_service_->FindPreference(prefs::kAutofillServiceUrl))
+    return;
+  pref_service_->RegisterStringPref(prefs::kAutofillServiceUrl,
+                                   kDefaultAutofillServiceUrl);
+}
+
+std::string AutofillDownloadUrl::GetBaseAutofillUrl() {
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  std::string baseAutoFillServiceUrl = command_line.GetSwitchValueASCII(

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

nit: "AutoFill" -> "Autofill"

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

Done.

+      switches::kAutofillServiceUrl);
+  if (ContainsOnlyWhitespaceASCII(baseAutoFillServiceUrl))
+    baseAutoFillServiceUrl =
+        pref_service_->GetString(prefs::kAutofillServiceUrl);
+
+  return baseAutoFillServiceUrl;
+}
+
+GURL AutofillDownloadUrl::GetAutofillRequestUrl() {
+  DCHECK(pref_service_);
+  RegisterPreferences();
+
+  std::string baseAutoFillServiceUrl = GetBaseAutofillUrl();
+  return GURL(baseAutoFillServiceUrl + "query?client=" + kClientName);
+}
+
+GURL AutofillDownloadUrl::GetAutofillUploadUrl() {
+  DCHECK(pref_service_);
+  RegisterPreferences();
+
+  std::string baseAutoFillServiceUrl = GetBaseAutofillUrl();
+  return GURL(baseAutoFillServiceUrl + "upload?client=" + kClientName);
+}