Changed cloud print private API to pass all page settings as single object.

chrome/service/cloud_print/connector_settings_unittest.cc

Index: chrome/service/cloud_print/connector_settings_unittest.cc
diff --git a/chrome/service/cloud_print/connector_settings_unittest.cc b/chrome/service/cloud_print/connector_settings_unittest.cc
index 9f812eafc717d939f6ddaacc6fd7ee3e30829bff..f1126e1c3dcc1493c342dec3df56702ec96333f9 100644
--- a/chrome/service/cloud_print/connector_settings_unittest.cc
+++ b/chrome/service/cloud_print/connector_settings_unittest.cc
@@ -30,16 +30,19 @@ const char kServiceStateContent[] =
     "      'robot_refresh_token': '123',"
     "      'service_url': 'http://cp.google.com',"
     "      'xmpp_auth_token': 'xmp token',"
-    "      'connect_new_printers': false,"
     "      'xmpp_ping_enabled': true,"
     "      'xmpp_ping_timeout_sec': 256,"
-    "      'printer_blacklist': ["
-    "         'prn1',"
-    "         'prn2'"
-    "       ],"
+    "      'user_settings': {"
+    "        'printers': ["
+    "          { 'name': 'prn1', 'connect': false },"
+    "          { 'name': 'prn2', 'connect': false },"
+    "          { 'name': 'prn3', 'connect': true }"
+    "        ],"
+    "        'connect_new_printers': false"
+    "      },"
     "      'print_system_settings': {"
     "         'delete_on_enum_fail' : true"
-    "       }"
+    "      }"
     "   }"
     "}";
 
@@ -87,9 +90,8 @@ TEST_F(ConnectorSettingsTest, InitFromEmpty) {
     EXPECT_FALSE(settings.proxy_id().empty());
     EXPECT_FALSE(settings.delete_on_enum_fail());
     EXPECT_EQ(NULL, settings.print_system_settings());
-    EXPECT_TRUE(settings.connect_new_printers());
+    EXPECT_TRUE(settings.ShouldConnect("prn1"));
     EXPECT_FALSE(settings.xmpp_ping_enabled());
-    EXPECT_FALSE(settings.IsPrinterBlacklisted("prn1"));
   }
 }
 
@@ -102,11 +104,11 @@ TEST_F(ConnectorSettingsTest, InitFromFile) {
   EXPECT_FALSE(settings.proxy_id().empty());
   EXPECT_TRUE(settings.delete_on_enum_fail());
   EXPECT_TRUE(settings.print_system_settings());
-  EXPECT_FALSE(settings.connect_new_printers());
   EXPECT_TRUE(settings.xmpp_ping_enabled());
   EXPECT_EQ(settings.xmpp_ping_timeout_sec(), 256);
-  EXPECT_FALSE(settings.IsPrinterBlacklisted("prn0"));
-  EXPECT_TRUE(settings.IsPrinterBlacklisted("prn1"));
+  EXPECT_FALSE(settings.ShouldConnect("prn0"));
+  EXPECT_FALSE(settings.ShouldConnect("prn1"));
+  EXPECT_TRUE(settings.ShouldConnect("prn3"));
 }
 
 TEST_F(ConnectorSettingsTest, CopyFrom) {
@@ -122,11 +124,12 @@ TEST_F(ConnectorSettingsTest, CopyFrom) {
   EXPECT_EQ(settings1.delete_on_enum_fail(), settings2.delete_on_enum_fail());
   EXPECT_EQ(settings1.print_system_settings()->size(),
             settings2.print_system_settings()->size());
-  EXPECT_EQ(settings1.connect_new_printers(), settings2.connect_new_printers());
   EXPECT_EQ(settings1.xmpp_ping_enabled(), settings2.xmpp_ping_enabled());
   EXPECT_EQ(settings1.xmpp_ping_timeout_sec(),
             settings2.xmpp_ping_timeout_sec());
-  EXPECT_TRUE(settings2.IsPrinterBlacklisted("prn1"));
+  EXPECT_FALSE(settings2.ShouldConnect("prn0"));
+  EXPECT_FALSE(settings2.ShouldConnect("prn1"));
+  EXPECT_TRUE(settings2.ShouldConnect("prn3"));
 }
 
 TEST_F(ConnectorSettingsTest, SettersTest) {