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

chrome/browser/search_engines/template_url_model_unittest.cc

Index: chrome/browser/search_engines/template_url_model_unittest.cc
===================================================================
--- chrome/browser/search_engines/template_url_model_unittest.cc	(revision 18266)
+++ chrome/browser/search_engines/template_url_model_unittest.cc	(working copy)
@@ -632,8 +632,8 @@
   EXPECT_TRUE(model_->GetTemplateURLForHost("google.com") == NULL);
   EXPECT_EQ("foo.com", t_url->url()->GetHost());
   EXPECT_EQ(L"foo.com", t_url->keyword());
-  EXPECT_EQ("http://foo.com/?q=x", t_url->url()->ReplaceSearchTerms(*t_url,
-      L"x", TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring()).spec());
+  EXPECT_EQ(L"http://foo.com/?q=x", t_url->url()->ReplaceSearchTerms(*t_url,
+      L"x", TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring()));
 }
 
 struct QueryHistoryCallbackImpl {
@@ -669,7 +669,8 @@
   HistoryService* history =
       profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
   history->AddPage(
-      t_url->url()->ReplaceSearchTerms(*t_url, L"blah", 0, std::wstring()),
+      GURL(WideToUTF8(t_url->url()->ReplaceSearchTerms(*t_url, L"blah", 0,
+                                                       std::wstring()))),
       NULL, 0, GURL(), PageTransition::KEYWORD, HistoryService::RedirectList());
 
   // Wait for history to finish processing the request.