Adding commandline switch and user pref for autofill server url.

chrome/browser/autofill/autofill_download_url.cc

+// 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/prefs/public/pref_service_base.h"
+#include "base/string_util.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/";
+
+#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;

[Ilya Sherman, 2012/10/25 22:52:02]

nit: Does anything actually go wrong if we remove this line?

+  pref_service_->RegisterStringPref(prefs::kAutofillServiceUrl,
+                                    kDefaultAutofillServiceUrl);

[Ilya Sherman, 2012/10/25 22:52:02]

It looks like the default value is the only value that we'll ever write into the
preferences.  What's the point?  That is, why not just keep it as a constant in
this file, and drop all the mucking about with preferences?

[ahutter, 2012/10/25 23:56:03]

Removed.

+}
+
+std::string AutofillDownloadUrl::GetBaseAutofillUrl() {
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  std::string baseAutofillServiceUrl = command_line.GetSwitchValueASCII(
+      switches::kAutofillServiceUrl);
+  if (ContainsOnlyWhitespaceASCII(baseAutofillServiceUrl))

[Ilya Sherman, 2012/10/25 22:52:02]

Optional nit: Can we just check for baseAutofillServiceUrl.empty() instead?

[ahutter, 2012/10/25 23:56:03]

Done.

+    baseAutofillServiceUrl =
+        pref_service_->GetString(prefs::kAutofillServiceUrl);

[Ilya Sherman, 2012/10/25 22:52:02]

nit: Please add curly braces to this if-stmt, since the body spans multiple
lines (even though it is only a single statement).

+
+  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);
+}
+