Fixes bug where keyword editor would end up prefixing all keyword urls...

chrome/browser/views/edit_keyword_controller.cc

 // Copyright (c) 2009 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/views/edit_keyword_controller.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ skipping 280 matching lines @@
   TemplateURLRef template_ref(url, 0, 0);
   if (!template_ref.IsValid())
     return false;
 
   if (!template_ref.SupportsReplacement())
     return GURL(url).is_valid();
 
   // If the url has a search term, replace it with a random string and make
   // sure the resulting URL is valid. We don't check the validity of the url
   // with the search term as that is not necessarily valid.
-  return template_ref.ReplaceSearchTerms(TemplateURL(), L"a",
-      TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring()).is_valid();
+  return GURL(WideToUTF8(template_ref.ReplaceSearchTerms(TemplateURL(), L"a",
+      TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring()))).is_valid();
 }
 
 std::wstring EditKeywordController::GetURL() const {
   std::wstring url;
   TrimWhitespace(TemplateURLRef::DisplayURLToURLRef(url_tf_->text()),
                  TRIM_ALL, &url);
   if (url.empty())
     return url;
 
-  // Parse the string as a URL to determine the scheme. If a scheme hasn't been
-  // specified, we add it.
+  // Parse the string as a URL to determine the scheme. If we need to, add the
+  // scheme. As the scheme may be expanded (as happens with {google:baseURL})
+  // we need to replace the search terms before testing for the scheme.
+  TemplateURL t_url;
+  t_url.SetURL(url, 0, 0);
+  std::wstring expanded_url =
+      t_url.url()->ReplaceSearchTerms(t_url, L"x", 0, std::wstring());
   url_parse::Parsed parts;
-  std::wstring scheme(URLFixerUpper::SegmentURL(url, &parts));
-  if (!parts.scheme.is_valid()) {
-    std::wstring fixed_scheme(scheme);
-    fixed_scheme.append(L"://");
-    url.insert(0, fixed_scheme);
+  std::string scheme(
+      URLFixerUpper::SegmentURL(WideToUTF8(expanded_url), &parts));
+  if(!parts.scheme.is_valid()) {
+    scheme.append("://");
+    url.insert(0, UTF8ToWide(scheme));
   }
 
   return url;
 }
 
 bool EditKeywordController::IsKeywordValid() const {
   std::wstring keyword = keyword_tf_->text();
   if (keyword.empty())
     return true;  // Always allow no keyword.
   const TemplateURL* turl_with_keyword =
@@ skipping 26 matching lines @@
 }
 
 void EditKeywordController::CleanUpCancelledAdd() {
   if (!keyword_editor_view_ && template_url_) {
     // When we have no KeywordEditorView, we know that the template_url_
     // hasn't yet been added to the model, so we need to clean it up.
     delete template_url_;
     template_url_ = NULL;
   }
 }