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

Unified Diff: components/mus/clipboard/clipboard_unittest.cc

Issue 2047703003: Revert of Implement ui::ClipboardMus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « components/mus/clipboard/clipboard_impl.cc ('k') | components/mus/public/interfaces/clipboard.mojom » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/clipboard/clipboard_unittest.cc
diff --git a/components/mus/clipboard/clipboard_unittest.cc b/components/mus/clipboard/clipboard_unittest.cc
index 764618395c7499a279eb88092f9c820d033f7fe9..d9b5ee5dadf746bd83163e8fa75e2f3e94bc3b32 100644
--- a/components/mus/clipboard/clipboard_unittest.cc
+++ b/components/mus/clipboard/clipboard_unittest.cc
@@ -58,13 +58,14 @@
return types.To<std::vector<std::string>>();
}
- bool GetDataOfType(const std::string& mime_type, std::string* data) {
+ bool GetDataOfType(uint64_t sequence_number, const std::string& mime_type,
+ std::string* data) {
bool valid = false;
Array<uint8_t> raw_data;
- uint64_t sequence_number = 0;
- clipboard_->ReadClipboardData(Clipboard::Type::COPY_PASTE, mime_type,
- &sequence_number, &raw_data);
- valid = !raw_data.is_null();
+ clipboard_->ReadMimeType(
+ sequence_number, Clipboard::Type::COPY_PASTE, mime_type,
+ &valid, &raw_data);
+ valid = valid && !raw_data.is_null();
*data = raw_data.is_null() ? "" : raw_data.To<std::string>();
return valid;
}
@@ -72,7 +73,7 @@
void SetStringText(const std::string& data) {
uint64_t sequence_number;
Map<String, Array<uint8_t>> mime_data;
- mime_data[mojom::kMimeTypeText] = Array<uint8_t>::From(data);
+ mime_data[Clipboard::MIME_TYPE_TEXT] = Array<uint8_t>::From(data);
clipboard_->WriteClipboardData(Clipboard::Type::COPY_PASTE,
std::move(mime_data),
&sequence_number);
@@ -88,26 +89,26 @@
EXPECT_EQ(0ul, GetSequenceNumber());
EXPECT_TRUE(GetAvailableFormatMimeTypes().empty());
std::string data;
- EXPECT_FALSE(GetDataOfType(mojom::kMimeTypeText, &data));
+ EXPECT_FALSE(GetDataOfType(0ul, Clipboard::MIME_TYPE_TEXT, &data));
}
TEST_F(ClipboardAppTest, CanReadBackText) {
std::string data;
EXPECT_EQ(0ul, GetSequenceNumber());
- EXPECT_FALSE(GetDataOfType(mojom::kMimeTypeText, &data));
+ EXPECT_FALSE(GetDataOfType(0ul, Clipboard::MIME_TYPE_TEXT, &data));
SetStringText(kPlainTextData);
EXPECT_EQ(1ul, GetSequenceNumber());
- EXPECT_TRUE(GetDataOfType(mojom::kMimeTypeText, &data));
+ EXPECT_TRUE(GetDataOfType(1ul, Clipboard::MIME_TYPE_TEXT, &data));
EXPECT_EQ(kPlainTextData, data);
}
TEST_F(ClipboardAppTest, CanSetMultipleDataTypesAtOnce) {
Map<String, Array<uint8_t>> mime_data;
- mime_data[mojom::kMimeTypeText] =
+ mime_data[Clipboard::MIME_TYPE_TEXT] =
Array<uint8_t>::From(std::string(kPlainTextData));
- mime_data[mojom::kMimeTypeHTML] =
+ mime_data[Clipboard::MIME_TYPE_HTML] =
Array<uint8_t>::From(std::string(kHtmlData));
uint64_t sequence_num = 0;
@@ -117,9 +118,9 @@
EXPECT_EQ(1ul, sequence_num);
std::string data;
- EXPECT_TRUE(GetDataOfType(mojom::kMimeTypeText, &data));
+ EXPECT_TRUE(GetDataOfType(1ul, Clipboard::MIME_TYPE_TEXT, &data));
EXPECT_EQ(kPlainTextData, data);
- EXPECT_TRUE(GetDataOfType(mojom::kMimeTypeHTML, &data));
+ EXPECT_TRUE(GetDataOfType(1ul, Clipboard::MIME_TYPE_HTML, &data));
EXPECT_EQ(kHtmlData, data);
}
@@ -128,7 +129,7 @@
SetStringText(kPlainTextData);
EXPECT_EQ(1ul, GetSequenceNumber());
- EXPECT_TRUE(GetDataOfType(mojom::kMimeTypeText, &data));
+ EXPECT_TRUE(GetDataOfType(1ul, Clipboard::MIME_TYPE_TEXT, &data));
EXPECT_EQ(kPlainTextData, data);
Map<String, Array<uint8_t>> mime_data;
@@ -138,7 +139,7 @@
&sequence_num);
EXPECT_EQ(2ul, sequence_num);
- EXPECT_FALSE(GetDataOfType(mojom::kMimeTypeText, &data));
+ EXPECT_FALSE(GetDataOfType(2ul, Clipboard::MIME_TYPE_TEXT, &data));
}
} // namespace clipboard
« no previous file with comments | « components/mus/clipboard/clipboard_impl.cc ('k') | components/mus/public/interfaces/clipboard.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698