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

chrome/browser/notifications/sync_notifier/synced_notification_app_info_service_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/notifications/sync_notifier/synced_notification_app_info_service.h"
 
 #include "chrome/browser/notifications/sync_notifier/sync_notifier_test_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 119 matching lines @@
     // Add to the list.
     app_info_service->sending_service_infos_.push_back(test_item2);
   }
 
   // Put some representative test data into the AppInfo protobuf.
   static void FillProtobufWithTestData1(
       sync_pb::SyncedNotificationAppInfo& protobuf) {
     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);
   }
 
   static void FillProtobufWithTestData2(
       sync_pb::SyncedNotificationAppInfo& protobuf) {
     protobuf.add_app_id(std::string(kAppId3));
     protobuf.set_settings_display_name(kSendingService1Name);
     protobuf.mutable_icon()->set_url(kTestIconUrl);
   }
 
   // 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) {
 
     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) {
     // CreateLocalData makes a copy of this, so it can safely live on the stack.
     EntitySpecifics entity_specifics;
     EXPECT_FALSE(app_id1.empty());
 
     sync_pb::SyncedNotificationAppInfoSpecifics* specifics =
         entity_specifics.mutable_synced_notification_app_info();
 
     // Add a synced_notification_app_info object.
     specifics->add_synced_notification_app_info();
     sync_pb::SyncedNotificationAppInfo* app_info =
         specifics->mutable_synced_notification_app_info(0);
 
     // 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);
 
     // Add the app IDs.
     app_info->add_app_id(app_id1);
 
     // Only add the second if it is non-empty
     if (!app_id2.empty()) {
       app_info->add_app_id(app_id2);
     }
@@ skipping 42 matching lines @@
 // Process sync changes when there is no local data.
 TEST_F(SyncedNotificationAppInfoServiceTest, ProcessSyncChangesEmptyModel) {
   // We initially have no data.
   SyncedNotificationAppInfoService app_info_service(profile_.get());
   app_info_service.set_avoid_bitmap_fetching_for_test(true);
 
   // Set up an ADD.
   SyncChangeList changes;
   changes.push_back(CreateSyncChange(SyncChange::ACTION_ADD,
                                      kSendingService1Name,
+                                     kTestInfoUrl,
                                      kTestIconUrl,
                                      kAppId1,
                                      kAppId2));
 
   // Process the changes we built.
   app_info_service.ProcessSyncChanges(FROM_HERE, changes);
 
   // Verify sync change made it to the SyncedNotificationAppInfo list.
   SyncedNotificationAppInfo* app_info1 =
       app_info_service.FindSyncedNotificationAppInfoByName(
@@ skipping 11 matching lines @@
     app_info_service.set_avoid_bitmap_fetching_for_test(true);
 
   // Create some local fake data. We rely on the specific ids set up here.
   AddTestingAppInfosToList(&app_info_service);
 
   // Set up an UPDATE.
   SyncChangeList changes;
 
   changes.push_back(CreateSyncChange(SyncChange::ACTION_UPDATE,
                                      kSendingService1Name,
+                                     kTestInfoUrl,
                                      kTestIconUrl,
                                      kAppId1,
                                      kAppId3));
 
   // Simulate incoming changed sync data at runtime.
   app_info_service.ProcessSyncChanges(FROM_HERE, changes);
 
   // We should find that the first item now has a different set of app ids.
   SyncedNotificationAppInfo* app_info1 =
       app_info_service.FindSyncedNotificationAppInfoByName(
@@ skipping 79 matching lines @@
   sync_pb::SyncedNotificationAppInfo protobuf;
   FillProtobufWithTestData1(protobuf);
 
   scoped_ptr<SyncedNotificationAppInfo> app_info;
   app_info =
       app_info_service.CreateSyncedNotificationAppInfoFromProtobuf(protobuf);
 
   // 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());
 }
 
 // Test our find by sending service name function.
 TEST_F(SyncedNotificationAppInfoServiceTest,
        FindSyncedNotificationAppInfoByNameTest) {
   SyncedNotificationAppInfoService app_info_service(profile_.get());
 
@@ skipping 70 matching lines @@
 
   std::vector<SyncedNotificationSendingServiceSettingsData> data;
   data = app_info_service.GetAllSendingServiceSettingsData();
 
   EXPECT_EQ(static_cast<unsigned int>(2), data.size());
   EXPECT_EQ(kSendingService1Name, data[0].settings_display_name);
   EXPECT_EQ(kSendingService2Name, data[1].settings_display_name);
 }
 
 }  // namespace notifier