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

chrome/browser/autocomplete/search_provider_unittest.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 "base/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/autocomplete/search_provider.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/net/test_url_fetcher_factory.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 80 matching lines @@
   default_t_url_->SetURL(L"http://defaultturl/{searchTerms}", 0, 0);
   default_t_url_->SetSuggestionsURL(L"http://defaultturl2/{searchTerms}", 0, 0);
   turl_model->Add(default_t_url_);
   turl_model->SetDefaultSearchProvider(default_t_url_);
   TemplateURL::IDType default_provider_id = default_t_url_->id();
   ASSERT_NE(0, default_provider_id);
 
   // Add url1, with search term term1_.
   HistoryService* history =
       profile_.GetHistoryService(Profile::EXPLICIT_ACCESS);
-  term1_url_ = default_t_url_->url()->ReplaceSearchTerms(
-      *default_t_url_, term1_, 0, std::wstring());
+  term1_url_ = GURL(WideToUTF8(default_t_url_->url()->ReplaceSearchTerms(
+      *default_t_url_, term1_, 0, std::wstring())));
   history->AddPageWithDetails(term1_url_, std::wstring(), 1, 1,
                               base::Time::Now(), false);
   history->SetKeywordSearchTermsForURL(term1_url_, default_t_url_->id(),
                                        term1_);
 
   // Create another TemplateURL.
   keyword_t_url_ = new TemplateURL();
   keyword_t_url_->set_keyword(L"k");
   keyword_t_url_->SetURL(L"http://keyword/{searchTerms}", 0, 0);
   keyword_t_url_->SetSuggestionsURL(L"http://suggest_keyword/{searchTerms}", 0,
                                     0);
   profile_.GetTemplateURLModel()->Add(keyword_t_url_);
   ASSERT_NE(0, keyword_t_url_->id());
 
   // Add a page and search term for keyword_t_url_.
-  keyword_url_ = keyword_t_url_->url()->ReplaceSearchTerms(
-      *keyword_t_url_, keyword_term_, 0, std::wstring());
+  keyword_url_ = GURL(WideToUTF8(keyword_t_url_->url()->ReplaceSearchTerms(
+      *keyword_t_url_, keyword_term_, 0, std::wstring())));
   history->AddPageWithDetails(keyword_url_, std::wstring(), 1, 1,
                               base::Time::Now(), false);
   history->SetKeywordSearchTermsForURL(keyword_url_, keyword_t_url_->id(),
                                        keyword_term_);
 
   provider_ = new SearchProvider(this, &profile_);
 
   URLFetcher::set_factory(&test_factory_);
 }
 
@@ skipping 52 matching lines @@
 TEST_F(SearchProviderTest, QueryDefaultProvider) {
   std::wstring term = term1_.substr(0, term1_.size() - 1);
   QueryForInput(term);
 
   // Make sure the default providers suggest service was queried.
   TestURLFetcher* fetcher = test_factory_.GetFetcherByID(
       SearchProvider::kDefaultProviderURLFetcherID);
   ASSERT_TRUE(fetcher);
 
   // And the URL matches what we expected.
-  GURL expected_url = default_t_url_->suggestions_url()->ReplaceSearchTerms(
-      *default_t_url_, term, 0, std::wstring());
+  GURL expected_url = GURL(WideToUTF8(default_t_url_->suggestions_url()->
+      ReplaceSearchTerms(*default_t_url_, term, 0, std::wstring())));
   ASSERT_TRUE(fetcher->original_url() == expected_url);
 
   // Tell the SearchProvider the suggest query is done.
   fetcher->delegate()->OnURLFetchComplete(
       fetcher, GURL(), URLRequestStatus(), 200, ResponseCookies(),
       std::string());
   fetcher = NULL;
 
   // Run till the history results complete.
   RunTillProviderDone();
@@ skipping 20 matching lines @@
       default_fetcher, GURL(), URLRequestStatus(), 200, ResponseCookies(),
       std::string());
   default_fetcher = NULL;
 
   // Make sure the keyword providers suggest service was queried.
   TestURLFetcher* keyword_fetcher = test_factory_.GetFetcherByID(
       SearchProvider::kKeywordProviderURLFetcherID);
   ASSERT_TRUE(keyword_fetcher);
 
   // And the URL matches what we expected.
-  GURL expected_url = keyword_t_url_->suggestions_url()->ReplaceSearchTerms(
-      *keyword_t_url_, term, 0, std::wstring());
+  GURL expected_url = GURL(WideToUTF8(keyword_t_url_->suggestions_url()->
+      ReplaceSearchTerms(*keyword_t_url_, term, 0, std::wstring())));
   ASSERT_TRUE(keyword_fetcher->original_url() == expected_url);
 
   // Tell the SearchProvider the keyword suggest query is done.
   keyword_fetcher->delegate()->OnURLFetchComplete(
       keyword_fetcher, GURL(), URLRequestStatus(), 200, ResponseCookies(),
       std::string());
   keyword_fetcher = NULL;
 
   // Run till the history results complete.
   RunTillProviderDone();
 
   // The SearchProvider is done. Make sure it has a result for the history
   // term keyword.
   AutocompleteMatch match = FindMatchWithDestination(keyword_url_);
   ASSERT_TRUE(!match.destination_url.is_empty());
 
   // The match should have a TemplateURL.
   EXPECT_TRUE(match.template_url);
 
   // The fill into edit should contain the keyword.
   EXPECT_EQ(keyword_t_url_->keyword() + L" " + keyword_term_,
             match.fill_into_edit);
 }