Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1670)

Unified Diff: chrome/browser/geolocation/geolocation_exceptions_table_model_unittest.cc

Issue 6044007: Remove wstring from TableModel.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/geolocation/geolocation_exceptions_table_model_unittest.cc
===================================================================
--- chrome/browser/geolocation/geolocation_exceptions_table_model_unittest.cc (revision 70272)
+++ chrome/browser/geolocation/geolocation_exceptions_table_model_unittest.cc (working copy)
@@ -127,17 +127,17 @@
CreateAllowedSamples();
// Ensure the parent doesn't have any indentation.
- std::wstring text(model_->GetText(0, IDS_EXCEPTIONS_HOSTNAME_HEADER));
- EXPECT_EQ(content_settings_helper::OriginToWString(kUrl0), text);
+ string16 text = model_->GetText(0, IDS_EXCEPTIONS_HOSTNAME_HEADER);
+ EXPECT_EQ(content_settings_helper::OriginToString16(kUrl0), text);
// Ensure there's some indentation on the children nodes.
text = model_->GetText(1, IDS_EXCEPTIONS_HOSTNAME_HEADER);
- EXPECT_NE(content_settings_helper::OriginToWString(kUrl1), text);
- EXPECT_NE(std::wstring::npos,
- text.find(content_settings_helper::OriginToWString(kUrl1)));
+ EXPECT_NE(content_settings_helper::OriginToString16(kUrl1), text);
+ EXPECT_NE(string16::npos,
+ text.find(content_settings_helper::OriginToString16(kUrl1)));
text = model_->GetText(2, IDS_EXCEPTIONS_HOSTNAME_HEADER);
- EXPECT_NE(content_settings_helper::OriginToWString(kUrl2), text);
- EXPECT_NE(std::wstring::npos,
- text.find(content_settings_helper::OriginToWString(kUrl2)));
+ EXPECT_NE(content_settings_helper::OriginToString16(kUrl2), text);
+ EXPECT_NE(string16::npos,
+ text.find(content_settings_helper::OriginToString16(kUrl2)));
}

Powered by Google App Engine
This is Rietveld 408576698