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

Unified Diff: app/tree_node_model_unittest.cc

Issue 3140022: Remove wstrings from bookmarks, part 7. (Closed)
Patch Set: it was the worst of times Created 10 years, 4 months 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
« no previous file with comments | « app/tree_node_model.h ('k') | chrome/browser/bookmarks/bookmark_codec.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/tree_node_model_unittest.cc
diff --git a/app/tree_node_model_unittest.cc b/app/tree_node_model_unittest.cc
index ce12b16246855f02b9f7f4f5a2f30f0d3f36d334..1b692ba30cc35a39e71f11ef3161320b35863fac 100644
--- a/app/tree_node_model_unittest.cc
+++ b/app/tree_node_model_unittest.cc
@@ -3,6 +3,8 @@
// found in the LICENSE file.
#include "app/tree_node_model.h"
+#include "base/string16.h"
+#include "base/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
class TreeNodeModelTest : public testing::Test, public TreeModelObserver {
@@ -278,8 +280,8 @@ TEST_F(TreeNodeModelTest, SetTitle) {
model.AddObserver(this);
ClearCounts();
- const std::wstring title(L"root2");
- model.SetTitle(root, title);
+ const string16 title(ASCIIToUTF16("root2"));
+ model.SetTitle(root, UTF16ToWideHack(title));
AssertObserverCount(0, 0, 1);
- EXPECT_EQ(WideToUTF16(title), root->GetTitleAsString16());
+ EXPECT_EQ(title, root->GetTitleAsString16());
}
« no previous file with comments | « app/tree_node_model.h ('k') | chrome/browser/bookmarks/bookmark_codec.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698