Adapting the UI to bring it closer to the spec, and fixing image fetching.

chrome/browser/notifications/sync_notifier/sync_notifier_test_utils.cc

 // Copyright 2013 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/sync_notifier_test_utils.h"
 
 // Fake data for creating a SyncData object to use in creating a
 // SyncedNotification.
 const char kAppId1[] = "fboilmbenheemaomgaeehigklolhkhnf";
 const char kAppId2[] = "fbcmoldooppoahjhfflnmljoanccekpf";
@@ skipping 91 matching lines @@
   coalesced_notification->set_app_id(app_id);
 
   coalesced_notification->set_key(key);
 
   coalesced_notification->
       set_priority(static_cast<sync_pb::CoalescedSyncedNotification_Priority>(
           kProtobufPriority));
 
   // Set the title.
   simple_expanded_layout->set_title(title);
+  simple_collapsed_layout->set_heading(title);
 
   // Set the text.
   simple_expanded_layout->set_text(text);
+  simple_collapsed_layout->set_description(text);
+  simple_collapsed_layout->set_annotation(text);
 
   // Set the heading.
   simple_collapsed_layout->set_heading(title);
 
   // Add the collapsed info and set the app_icon_url on it.
-  expanded_info->add_collapsed_info();
-  expanded_info->
-      mutable_collapsed_info(0)->
-      mutable_simple_collapsed_layout()->
+  simple_collapsed_layout->
       mutable_app_icon()->
       set_url(app_icon_url);
 
   // Add the media object and set the image url on it.
-  simple_expanded_layout->add_media();
-  simple_expanded_layout->
+  simple_collapsed_layout->add_media();
+  simple_collapsed_layout->
       mutable_media(0)->
       mutable_image()->
       set_url(image_url);
 
   coalesced_notification->set_creation_time_msec(kFakeCreationTime);
 
   coalesced_notification->set_read_state(read_state);
 
   // Contained notification one.
-  // We re-use the collapsed info we added for the app_icon_url,
-  // so no need to create another one here.
+  expanded_info->add_collapsed_info();
   sync_pb::SimpleCollapsedLayout* notification_layout1 =
       expanded_info->
       mutable_collapsed_info(0)->
       mutable_simple_collapsed_layout();
   notification_layout1->set_heading(kContainedTitle1);
   notification_layout1->set_description(kContainedMessage1);
 
   // Contained notification two.
   expanded_info->add_collapsed_info();
   sync_pb::SimpleCollapsedLayout* notification_layout2 =
@@ skipping 38 matching lines @@
   action2->mutable_icon()->set_alt_text(kButtonTwoTitle);
   action2->set_url(kButtonTwoUrl);
 
   syncer::SyncData sync_data = syncer::SyncData::CreateLocalData(
       "syncer::SYNCED_NOTIFICATIONS",
       "ChromeNotifierServiceUnitTest",
       entity_specifics);
 
   return sync_data;
 }