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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/printer_detector/printer_detector_unittest.cc

Issue 1739183003: Make extensions::DictionaryBuilder and extensions::ListValue unmovable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « chrome/browser/chromeos/power/renderer_freezer_unittest.cc ('k') | chrome/browser/extensions/active_script_controller_unittest.cc » ('j') | chrome/browser/extensions/activity_log/activity_log_policy_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/printer_detector/printer_detector_unittest.cc
diff --git a/chrome/browser/chromeos/printer_detector/printer_detector_unittest.cc b/chrome/browser/chromeos/printer_detector/printer_detector_unittest.cc
index b7d5ad63c6c46157d9ae4b28d4375a3527c17edf..0f36776e8928f0a2d927940b12d4afb9f44c9670 100644
--- a/chrome/browser/chromeos/printer_detector/printer_detector_unittest.cc
+++ b/chrome/browser/chromeos/printer_detector/printer_detector_unittest.cc
@@ -129,23 +129,27 @@ class PrinterDetectorAppSearchEnabledTest : public testing::Test {
// Creates a test extension with the provided permissions.
scoped_refptr<extensions::Extension> CreateTestExtension(
- ListBuilder permissions_builder,
- DictionaryBuilder usb_printers_builder) {
+ scoped_ptr<base::ListValue> permissions_builder,
+ scoped_ptr<base::DictionaryValue> usb_printers_builder) {
return extensions::ExtensionBuilder()
.SetID("fake_extension_id")
- .SetManifest(std::move(
+ .SetManifest(
DictionaryBuilder()
.Set("name", "Printer provider extension")
.Set("manifest_version", 2)
.Set("version", "1.0")
// Needed to enable usb API.
- .Set("app", std::move(DictionaryBuilder().Set(
- "background",
- std::move(DictionaryBuilder().Set(
- "scripts", std::move(ListBuilder().Append(
- "bg.js")))))))
+ .Set("app",
+ DictionaryBuilder()
+ .Set("background",
+ DictionaryBuilder()
+ .Set("scripts",
+ ListBuilder().Append("bg.js").Build())
+ .Build())
+ .Build())
.Set("permissions", std::move(permissions_builder))
- .Set("usb_printers", std::move(usb_printers_builder))))
+ .Set("usb_printers", std::move(usb_printers_builder))
+ .Build())
.Build();
}
@@ -174,15 +178,19 @@ TEST_F(PrinterDetectorAppSearchEnabledTest, ShowFindAppNotification) {
TEST_F(PrinterDetectorAppSearchEnabledTest, ShowAppFoundNotification) {
scoped_refptr<extensions::Extension> extension = CreateTestExtension(
- std::move(ListBuilder()
- .Append("usb")
- .Append("printerProvider")
- .Append(std::move(DictionaryBuilder().Set(
- "usbDevices", std::move(ListBuilder().Append(std::move(
- DictionaryBuilder()
- .Set("vendorId", 123)
- .Set("productId", 456)))))))),
- std::move(DictionaryBuilder().Set("filters", ListBuilder())));
+ ListBuilder()
+ .Append("usb")
+ .Append("printerProvider")
+ .Append(DictionaryBuilder()
+ .Set("usbDevices", ListBuilder()
+ .Append(DictionaryBuilder()
+ .Set("vendorId", 123)
+ .Set("productId", 456)
+ .Build())
+ .Build())
+ .Build())
+ .Build(),
+ DictionaryBuilder().Set("filters", ListBuilder().Build()).Build());
ASSERT_TRUE(extensions::ExtensionRegistry::Get(profile_.get())
->AddEnabled(extension));
@@ -200,13 +208,18 @@ TEST_F(PrinterDetectorAppSearchEnabledTest, ShowAppFoundNotification) {
TEST_F(PrinterDetectorAppSearchEnabledTest,
UsbHandlerExists_NotPrinterProvider) {
scoped_refptr<extensions::Extension> extension = CreateTestExtension(
- std::move(
- ListBuilder().Append("usb").Append(std::move(DictionaryBuilder().Set(
- "usbDevices", std::move(ListBuilder().Append(
- std::move(DictionaryBuilder()
- .Set("vendorId", 123)
- .Set("productId", 756)))))))),
- std::move(DictionaryBuilder().Set("filters", ListBuilder())));
+ ListBuilder()
+ .Append("usb")
+ .Append(DictionaryBuilder()
+ .Set("usbDevices", ListBuilder()
+ .Append(DictionaryBuilder()
+ .Set("vendorId", 123)
+ .Set("productId", 756)
+ .Build())
+ .Build())
+ .Build())
+ .Build(),
+ DictionaryBuilder().Set("filters", ListBuilder().Build()).Build());
ASSERT_TRUE(extensions::ExtensionRegistry::Get(profile_.get())
->AddEnabled(extension));
@@ -224,15 +237,19 @@ TEST_F(PrinterDetectorAppSearchEnabledTest,
TEST_F(PrinterDetectorAppSearchEnabledTest,
PrinterProvider_DifferentUsbProductId) {
scoped_refptr<extensions::Extension> extension = CreateTestExtension(
- std::move(ListBuilder()
- .Append("usb")
- .Append("printerProvider")
- .Append(std::move(DictionaryBuilder().Set(
- "usbDevices", std::move(ListBuilder().Append(std::move(
- DictionaryBuilder()
- .Set("vendorId", 123)
- .Set("productId", 001)))))))),
- std::move(DictionaryBuilder().Set("filters", ListBuilder())));
+ ListBuilder()
+ .Append("usb")
+ .Append("printerProvider")
+ .Append(DictionaryBuilder()
+ .Set("usbDevices", ListBuilder()
+ .Append(DictionaryBuilder()
+ .Set("vendorId", 123)
+ .Set("productId", 001)
+ .Build())
+ .Build())
+ .Build())
+ .Build(),
+ DictionaryBuilder().Set("filters", ListBuilder().Build()).Build());
ASSERT_TRUE(extensions::ExtensionRegistry::Get(profile_.get())
->AddEnabled(extension));
@@ -250,12 +267,15 @@ TEST_F(PrinterDetectorAppSearchEnabledTest,
TEST_F(PrinterDetectorAppSearchEnabledTest,
PrinterProvider_UsbPrinters_NotFound) {
scoped_refptr<extensions::Extension> extension = CreateTestExtension(
- std::move(ListBuilder().Append("usb").Append("printerProvider")),
- std::move(DictionaryBuilder().Set(
- "filters", std::move(ListBuilder().Append(
- std::move(DictionaryBuilder()
- .Set("vendorId", 123)
- .Set("productId", 001)))))));
+ ListBuilder().Append("usb").Append("printerProvider").Build(),
+ DictionaryBuilder()
+ .Set("filters", ListBuilder()
+ .Append(DictionaryBuilder()
+ .Set("vendorId", 123)
+ .Set("productId", 001)
+ .Build())
+ .Build())
+ .Build());
ASSERT_TRUE(extensions::ExtensionRegistry::Get(profile_.get())
->AddEnabled(extension));
@@ -273,12 +293,15 @@ TEST_F(PrinterDetectorAppSearchEnabledTest,
TEST_F(PrinterDetectorAppSearchEnabledTest,
PrinterProvider_UsbPrinters_WithProductId) {
scoped_refptr<extensions::Extension> extension = CreateTestExtension(
- std::move(ListBuilder().Append("usb").Append("printerProvider")),
- std::move(DictionaryBuilder().Set(
- "filters", std::move(ListBuilder().Append(
- std::move(DictionaryBuilder()
- .Set("vendorId", 123)
- .Set("productId", 456)))))));
+ ListBuilder().Append("usb").Append("printerProvider").Build(),
+ DictionaryBuilder()
+ .Set("filters", ListBuilder()
+ .Append(DictionaryBuilder()
+ .Set("vendorId", 123)
+ .Set("productId", 456)
+ .Build())
+ .Build())
+ .Build());
ASSERT_TRUE(extensions::ExtensionRegistry::Get(profile_.get())
->AddEnabled(extension));
@@ -296,13 +319,16 @@ TEST_F(PrinterDetectorAppSearchEnabledTest,
TEST_F(PrinterDetectorAppSearchEnabledTest,
PrinterProvider_UsbPrinters_WithInterfaceClass) {
scoped_refptr<extensions::Extension> extension = CreateTestExtension(
- std::move(ListBuilder().Append("usb").Append("printerProvider")),
- std::move(DictionaryBuilder().Set(
- "filters",
- std::move(ListBuilder().Append(std::move(
- DictionaryBuilder()
- .Set("vendorId", 123)
- .Set("interfaceClass", kPrinterInterfaceClass)))))));
+ ListBuilder().Append("usb").Append("printerProvider").Build(),
+ DictionaryBuilder()
+ .Set("filters",
+ ListBuilder()
+ .Append(DictionaryBuilder()
+ .Set("vendorId", 123)
+ .Set("interfaceClass", kPrinterInterfaceClass)
+ .Build())
+ .Build())
+ .Build());
ASSERT_TRUE(extensions::ExtensionRegistry::Get(profile_.get())
->AddEnabled(extension));
@@ -319,13 +345,16 @@ TEST_F(PrinterDetectorAppSearchEnabledTest,
TEST_F(PrinterDetectorAppSearchEnabledTest, IgnoreNonPrinters) {
scoped_refptr<extensions::Extension> extension = CreateTestExtension(
- std::move(ListBuilder().Append("usb").Append("printerProvider")),
- std::move(DictionaryBuilder().Set(
- "filters",
- std::move(ListBuilder().Append(std::move(
- DictionaryBuilder()
- .Set("vendorId", 123)
- .Set("interfaceClass", kPrinterInterfaceClass)))))));
+ ListBuilder().Append("usb").Append("printerProvider").Build(),
+ DictionaryBuilder()
+ .Set("filters",
+ ListBuilder()
+ .Append(DictionaryBuilder()
+ .Set("vendorId", 123)
+ .Set("interfaceClass", kPrinterInterfaceClass)
+ .Build())
+ .Build())
+ .Build());
ASSERT_TRUE(extensions::ExtensionRegistry::Get(profile_.get())
->AddEnabled(extension));
« no previous file with comments | « chrome/browser/chromeos/power/renderer_freezer_unittest.cc ('k') | chrome/browser/extensions/active_script_controller_unittest.cc » ('j') | chrome/browser/extensions/activity_log/activity_log_policy_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698