Make the autocomplete system and various other connected bits of code use GURL instead of wstring where appropriate. Original patch by phajdan.jr@gmail.com, r=me,sky. See http://codereview.chromium.org/13205 .

BUG=715234

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6758 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 8 deletions

diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc
index efbb43e..4eb913f 100644
--- a/chrome/browser/views/edit_keyword_controller.cc
+++ b/chrome/browser/views/edit_keyword_controller.cc
@@ -296,14 +296,14 @@ bool EditKeywordController::IsURLValid() const {
   if (!template_ref.IsValid())
     return false;
 
-  if (template_ref.SupportsReplacement()) {
-    // 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.
-    url = template_ref.ReplaceSearchTerms(TemplateURL(), L"a",
-        TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring());
-  }
-  return GURL(url).is_valid();
+  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();
 }
 
 std::wstring EditKeywordController::GetURL() const {