Remove wstring from TemplateURL and friends....

chrome/browser/extensions/extension_omnibox_apitest.cc

Index: chrome/browser/extensions/extension_omnibox_apitest.cc
===================================================================
--- chrome/browser/extensions/extension_omnibox_apitest.cc	(revision 71269)
+++ chrome/browser/extensions/extension_omnibox_apitest.cc	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -108,7 +108,7 @@
     match = result.match_at(1);
     ASSERT_TRUE(match.template_url);
     EXPECT_TRUE(match.template_url->IsExtensionKeyword());
-    EXPECT_EQ(L"keyword", match.template_url->keyword());
+    EXPECT_EQ(ASCIIToUTF16("keyword"), match.template_url->keyword());
   }
 
   // Test that our extension can send suggestions back to us.