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

Unified Diff: ui/base/clipboard/clipboard_unittest.cc

Issue 9447084: Refactor Pickle Read methods to use higher performance PickleIterator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: jar feedback Created 8 years, 10 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
Index: ui/base/clipboard/clipboard_unittest.cc
diff --git a/ui/base/clipboard/clipboard_unittest.cc b/ui/base/clipboard/clipboard_unittest.cc
index f00d4fd11092be2d3d0eefb89d75dda9c40623be..9b38d34e95d377570b3bd0a0c3417e85ffc541d8 100644
--- a/ui/base/clipboard/clipboard_unittest.cc
+++ b/ui/base/clipboard/clipboard_unittest.cc
@@ -445,7 +445,7 @@ TEST_F(ClipboardTest, DataTest) {
ASSERT_FALSE(output.empty());
Pickle read_pickle(output.data(), output.size());
- void* iter = NULL;
+ PickleReader iter(read_pickle);
std::string unpickled_string;
ASSERT_TRUE(read_pickle.ReadString(&iter, &unpickled_string));
EXPECT_EQ(payload, unpickled_string);
@@ -482,7 +482,7 @@ TEST_F(ClipboardTest, MultipleDataTest) {
ASSERT_FALSE(output2.empty());
Pickle read_pickle2(output2.data(), output2.size());
- void* iter2 = NULL;
+ PickleReader iter2(read_pickle2);
std::string unpickled_string2;
ASSERT_TRUE(read_pickle2.ReadString(&iter2, &unpickled_string2));
EXPECT_EQ(payload2, unpickled_string2);
@@ -504,7 +504,7 @@ TEST_F(ClipboardTest, MultipleDataTest) {
ASSERT_FALSE(output1.empty());
Pickle read_pickle1(output1.data(), output1.size());
- void* iter1 = NULL;
+ PickleReader iter1(read_pickle1);
std::string unpickled_string1;
ASSERT_TRUE(read_pickle1.ReadString(&iter1, &unpickled_string1));
EXPECT_EQ(payload1, unpickled_string1);

Powered by Google App Engine
This is Rietveld 408576698