Reland r262272: "Hook up the Info URL from SyncedNotificationsAppInfo".

chrome/browser/notifications/sync_notifier/synced_notification_app_info_service_unittest.cc

Index: chrome/browser/notifications/sync_notifier/synced_notification_app_info_service_unittest.cc
diff --git a/chrome/browser/notifications/sync_notifier/synced_notification_app_info_service_unittest.cc b/chrome/browser/notifications/sync_notifier/synced_notification_app_info_service_unittest.cc
index 9988229e5c48a34eda22c4948834997dddff6495..ca4713ccaa29031bbdcad23abc0afc7259a37fef 100644
--- a/chrome/browser/notifications/sync_notifier/synced_notification_app_info_service_unittest.cc
+++ b/chrome/browser/notifications/sync_notifier/synced_notification_app_info_service_unittest.cc
@@ -137,6 +137,7 @@ class SyncedNotificationAppInfoServiceTest : public testing::Test {
     protobuf.add_app_id(std::string(kAppId1));
     protobuf.add_app_id(std::string(kAppId2));
     protobuf.set_settings_display_name(kSendingService1Name);
+    protobuf.set_info_url(kTestInfoUrl);
     protobuf.mutable_icon()->set_url(kTestIconUrl);
   }
 
@@ -150,6 +151,7 @@ class SyncedNotificationAppInfoServiceTest : public testing::Test {
   // Helper to create syncer::SyncChange.
   static SyncChange CreateSyncChange(SyncChange::SyncChangeType type,
                                      const std::string& settings_display_name,
+                                     const std::string& info_url,
                                      const std::string& icon_url,
                                      const std::string& app_id1,
                                      const std::string& app_id2) {
@@ -157,11 +159,13 @@ class SyncedNotificationAppInfoServiceTest : public testing::Test {
     return SyncChange(
         FROM_HERE,
         type,
-        CreateSyncData(settings_display_name, icon_url, app_id1, app_id2));
+        CreateSyncData(
+            settings_display_name, info_url, icon_url, app_id1, app_id2));
   }
 
   // Build a SyncData object to look like what Sync would deliver.
   static SyncData CreateSyncData(const std::string& settings_display_name,
+                                 const std::string& info_url,
                                  const std::string& icon_url,
                                  const std::string& app_id1,
                                  const std::string& app_id2) {
@@ -180,6 +184,9 @@ class SyncedNotificationAppInfoServiceTest : public testing::Test {
     // Add the key, the settings display name.
     app_info->set_settings_display_name(settings_display_name);
 
+    // Add the welcome notification info URL.
+    app_info->set_info_url(info_url);
+
     // Add the icon URL.
     app_info->mutable_icon()->set_url(icon_url);
 
@@ -242,6 +249,7 @@ TEST_F(SyncedNotificationAppInfoServiceTest, ProcessSyncChangesEmptyModel) {
   SyncChangeList changes;
   changes.push_back(CreateSyncChange(SyncChange::ACTION_ADD,
                                      kSendingService1Name,
+                                     kTestInfoUrl,
                                      kTestIconUrl,
                                      kAppId1,
                                      kAppId2));
@@ -273,6 +281,7 @@ TEST_F(SyncedNotificationAppInfoServiceTest, ProcessSyncChangesNonEmptyModel) {
 
   changes.push_back(CreateSyncChange(SyncChange::ACTION_UPDATE,
                                      kSendingService1Name,
+                                     kTestInfoUrl,
                                      kTestIconUrl,
                                      kAppId1,
                                      kAppId3));
@@ -372,6 +381,7 @@ TEST_F(SyncedNotificationAppInfoServiceTest,
   // Ensure the app info class has the fields we expect.
   EXPECT_EQ(std::string(kSendingService1Name),
             app_info->settings_display_name());
+  EXPECT_EQ(GURL(kTestInfoUrl), app_info->welcome_link_url());
   EXPECT_TRUE(app_info->HasAppId(kAppId1));
   EXPECT_TRUE(app_info->HasAppId(kAppId2));
   EXPECT_EQ(GURL(std::string(kTestIconUrl)), app_info->settings_icon_url());