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

chrome/browser/search_engines/template_url_model_unittest.cc

 // Copyright (c) 2006-2008 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 "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/pref_service.h"
@@ skipping 614 matching lines @@
                            // changing.
   SetGoogleBaseURL(L"http://foo.com/");
   model_->GoogleBaseURLChanged();
   VerifyObserverCount(1);
 
   // Make sure the host->TemplateURL map was updated appropriately.
   ASSERT_EQ(t_url, model_->GetTemplateURLForHost("foo.com"));
   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 {
   QueryHistoryCallbackImpl() : success(false) {}
 
   void Callback(HistoryService::Handle handle,
                 bool success, const history::URLRow* row,
                 history::VisitVector* visits) {
     this->success = success;
     if (row)
@@ skipping 15 matching lines @@
 
   // Create a keyword.
   TemplateURL* t_url = AddKeywordWithDate(
       L"keyword", false, L"http://foo.com/foo?query={searchTerms}",
       L"keyword", true, base::Time::Now());
 
   // Add a visit that matches the url of the keyword.
   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.
   profile_->BlockUntilHistoryProcessesPendingRequests();
 
   // Query history for the generated url.
   CancelableRequestConsumer consumer;
   QueryHistoryCallbackImpl callback;
   history->QueryURL(GURL("http://keyword"), true, &consumer,
       NewCallback(&callback, &QueryHistoryCallbackImpl::Callback));
 
   // Wait for the request to be processed.
   profile_->BlockUntilHistoryProcessesPendingRequests();
 
   // And make sure the url and visit were added.
   EXPECT_TRUE(callback.success);
   EXPECT_NE(0, callback.row.id());
   ASSERT_EQ(1U, callback.visits.size());
   EXPECT_EQ(PageTransition::KEYWORD_GENERATED,
             PageTransition::StripQualifier(callback.visits[0].transition));
 }