Some fixups for app notifications:

chrome/browser/extensions/app_notification_manager_sync_unittest.cc

 // Copyright (c) 2011 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 "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/extensions/app_notification_manager.h"
 #include "chrome/browser/extensions/app_notification.h"
 #include "chrome/browser/sync/protocol/app_notification_specifics.pb.h"
@@ skipping 128 matching lines @@
                                              const std::string& link_text) {
     AppNotification* notif = new AppNotification(
         is_local, guid, extension_id, title, body);
     if (!link_url.empty())
       notif->set_link_url(GURL(link_url));
     if (!link_text.empty())
       notif->set_link_text(link_text);
     return notif;
   }
 
-  static AppNotification* CreateNotification(const AppNotification& notif) {
-    return CreateNotification(
-        notif.is_local(), notif.guid(), notif.extension_id(), notif.title(),
-        notif.body(), notif.link_url().spec(), notif.link_text());
-  }
-
   static SyncData CreateSyncData(int suffix) {
     scoped_ptr<AppNotification> notif(CreateNotification(suffix));
     return AppNotificationManager::CreateSyncDataFromNotification(*notif);
   }
   static SyncData CreateSyncData(int suffix, const std::string& extension_id) {
     scoped_ptr<AppNotification> notif(
         CreateNotification(false, suffix, extension_id));
     return AppNotificationManager::CreateSyncDataFromNotification(*notif);
   }
 
@@ skipping 319 matching lines @@
   model()->Add(n2);
   model()->MergeDataAndStartSyncing(
       syncable::APP_NOTIFICATIONS,
       SyncDataList(),
       processor());
 
   // Some adds and some deletes.
   SyncChangeList changes;
   changes.push_back(CreateSyncChange(
       SyncChange::ACTION_ADD, CreateNotification(3)));
-  changes.push_back(CreateSyncChange(
-      SyncChange::ACTION_DELETE, CreateNotification(*n1)));
+  changes.push_back(CreateSyncChange(SyncChange::ACTION_DELETE, n1->Copy()));
   changes.push_back(CreateSyncChange(
       SyncChange::ACTION_ADD, CreateNotification(4)));
 
   model()->ProcessSyncChanges(FROM_HERE, changes);
 
   EXPECT_EQ(3U, model()->GetAllSyncData(syncable::APP_NOTIFICATIONS).size());
   EXPECT_EQ(2, processor()->change_list_size());
 }
 
 // Process sync changes should return error if model association is not done.
@@ skipping 73 matching lines @@
 
   EXPECT_EQ(3, processor()->change_list_size());
   EXPECT_TRUE(processor()->ContainsGuid(n1->guid()));
   SyncChange c1 = processor()->GetChangeByGuid(n1->guid());
   AssertSyncChange(c1, SyncChange::ACTION_DELETE, *n1);
   SyncChange c2 = processor()->GetChangeByGuid(n2->guid());
   AssertSyncChange(c2, SyncChange::ACTION_DELETE, *n2);
   SyncChange c3 = processor()->GetChangeByGuid(n3->guid());
   AssertSyncChange(c3, SyncChange::ACTION_DELETE, *n3);
 }