Remove wstring from TableModel....

chrome/common/content_settings_helper_unittest.cc

Index: chrome/common/content_settings_helper_unittest.cc
===================================================================
--- chrome/common/content_settings_helper_unittest.cc	(revision 70272)
+++ chrome/common/content_settings_helper_unittest.cc	(working copy)
@@ -4,6 +4,7 @@
 
 #include "chrome/common/content_settings_helper.h"
 
+#include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -23,20 +24,24 @@
   const GURL kUrl7("https://foo.com:81/bar");
 
   // Now check the first group of urls with just "http":
-  EXPECT_EQ(L"www.foo.com", content_settings_helper::OriginToWString(kUrl0));
-  EXPECT_EQ(L"foo.com", content_settings_helper::OriginToWString(kUrl1));
+  EXPECT_EQ(ASCIIToUTF16("www.foo.com"),
+            content_settings_helper::OriginToString16(kUrl0));
+  EXPECT_EQ(ASCIIToUTF16("foo.com"),
+            content_settings_helper::OriginToString16(kUrl1));
 
-  EXPECT_EQ(L"www.foo.com:81", content_settings_helper::OriginToWString(kUrl2));
-  EXPECT_EQ(L"foo.com:81", content_settings_helper::OriginToWString(kUrl3));
+  EXPECT_EQ(ASCIIToUTF16("www.foo.com:81"),
+            content_settings_helper::OriginToString16(kUrl2));
+  EXPECT_EQ(ASCIIToUTF16("foo.com:81"),
+            content_settings_helper::OriginToString16(kUrl3));
 
   // Now check the second group of urls with "https":
-  EXPECT_EQ(L"https://www.foo.com",
-            content_settings_helper::OriginToWString(kUrl4));
-  EXPECT_EQ(L"https://foo.com",
-            content_settings_helper::OriginToWString(kUrl5));
+  EXPECT_EQ(ASCIIToUTF16("https://www.foo.com"),
+            content_settings_helper::OriginToString16(kUrl4));
+  EXPECT_EQ(ASCIIToUTF16("https://foo.com"),
+            content_settings_helper::OriginToString16(kUrl5));
 
-  EXPECT_EQ(L"https://www.foo.com:81",
-            content_settings_helper::OriginToWString(kUrl6));
-  EXPECT_EQ(L"https://foo.com:81",
-            content_settings_helper::OriginToWString(kUrl7));
+  EXPECT_EQ(ASCIIToUTF16("https://www.foo.com:81"),
+            content_settings_helper::OriginToString16(kUrl6));
+  EXPECT_EQ(ASCIIToUTF16("https://foo.com:81"),
+            content_settings_helper::OriginToString16(kUrl7));
 }