| Index: ui/base/clipboard/clipboard_test_template.h
|
| diff --git a/ui/base/clipboard/clipboard_test_template.h b/ui/base/clipboard/clipboard_test_template.h
|
| index 9d519213888de22f50ff226541931b849b235c45..844266bcf6bc7cb761cfa770701e09eaae71102e 100644
|
| --- a/ui/base/clipboard/clipboard_test_template.h
|
| +++ b/ui/base/clipboard/clipboard_test_template.h
|
| @@ -398,7 +398,7 @@ TYPED_TEST(ClipboardTest, DataTest) {
|
| const ui::Clipboard::FormatType kFormat =
|
| ui::Clipboard::GetFormatType("chromium/x-test-format");
|
| std::string payload("test string");
|
| - Pickle write_pickle;
|
| + base::Pickle write_pickle;
|
| write_pickle.WriteString(payload);
|
|
|
| {
|
| @@ -412,8 +412,8 @@ TYPED_TEST(ClipboardTest, DataTest) {
|
| this->clipboard().ReadData(kFormat, &output);
|
| ASSERT_FALSE(output.empty());
|
|
|
| - Pickle read_pickle(output.data(), output.size());
|
| - PickleIterator iter(read_pickle);
|
| + base::Pickle read_pickle(output.data(), output.size());
|
| + base::PickleIterator iter(read_pickle);
|
| std::string unpickled_string;
|
| ASSERT_TRUE(iter.ReadString(&unpickled_string));
|
| EXPECT_EQ(payload, unpickled_string);
|
| @@ -423,13 +423,13 @@ TYPED_TEST(ClipboardTest, MultipleDataTest) {
|
| const ui::Clipboard::FormatType kFormat1 =
|
| ui::Clipboard::GetFormatType("chromium/x-test-format1");
|
| std::string payload1("test string1");
|
| - Pickle write_pickle1;
|
| + base::Pickle write_pickle1;
|
| write_pickle1.WriteString(payload1);
|
|
|
| const ui::Clipboard::FormatType kFormat2 =
|
| ui::Clipboard::GetFormatType("chromium/x-test-format2");
|
| std::string payload2("test string2");
|
| - Pickle write_pickle2;
|
| + base::Pickle write_pickle2;
|
| write_pickle2.WriteString(payload2);
|
|
|
| {
|
| @@ -447,8 +447,8 @@ TYPED_TEST(ClipboardTest, MultipleDataTest) {
|
| this->clipboard().ReadData(kFormat2, &output2);
|
| ASSERT_FALSE(output2.empty());
|
|
|
| - Pickle read_pickle2(output2.data(), output2.size());
|
| - PickleIterator iter2(read_pickle2);
|
| + base::Pickle read_pickle2(output2.data(), output2.size());
|
| + base::PickleIterator iter2(read_pickle2);
|
| std::string unpickled_string2;
|
| ASSERT_TRUE(iter2.ReadString(&unpickled_string2));
|
| EXPECT_EQ(payload2, unpickled_string2);
|
| @@ -468,8 +468,8 @@ TYPED_TEST(ClipboardTest, MultipleDataTest) {
|
| this->clipboard().ReadData(kFormat1, &output1);
|
| ASSERT_FALSE(output1.empty());
|
|
|
| - Pickle read_pickle1(output1.data(), output1.size());
|
| - PickleIterator iter1(read_pickle1);
|
| + base::Pickle read_pickle1(output1.data(), output1.size());
|
| + base::PickleIterator iter1(read_pickle1);
|
| std::string unpickled_string1;
|
| ASSERT_TRUE(iter1.ReadString(&unpickled_string1));
|
| EXPECT_EQ(payload1, unpickled_string1);
|
| @@ -636,7 +636,7 @@ TYPED_TEST(ClipboardTest, WriteHyperlinkEmptyParams) {
|
|
|
| TYPED_TEST(ClipboardTest, WritePickledData) {
|
| ScopedClipboardWriter scw(CLIPBOARD_TYPE_COPY_PASTE);
|
| - scw.WritePickledData(Pickle(), Clipboard::GetPlainTextFormatType());
|
| + scw.WritePickledData(base::Pickle(), Clipboard::GetPlainTextFormatType());
|
| }
|
|
|
| TYPED_TEST(ClipboardTest, WriteImageEmptyParams) {
|
|
|