Rename notification_id() to disambiguate its meaning

chrome/browser/notifications/notification_test_util.cc

 // Copyright (c) 2012 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/notification_test_util.h"
 
 MockNotificationDelegate::MockNotificationDelegate(const std::string& id)
     : id_(id) {}
 
 MockNotificationDelegate::~MockNotificationDelegate() {}
@@ skipping 47 matching lines @@
   dismissed_id_ = notification_id;
   return true;
 }
 
 std::set<std::string>
 StubNotificationUIManager::GetAllIdsByProfileAndSourceOrigin(
     Profile* profile,
     const GURL& source) {
   std::set<std::string> notification_ids;
   if (source == notification_.origin_url() && profile->IsSameProfile(profile_))
-    notification_ids.insert(notification_.notification_id());
+    notification_ids.insert(notification_.delegate_id());
   return notification_ids;
 }
 
 bool StubNotificationUIManager::CancelAllBySourceOrigin(
     const GURL& source_origin) {
   return false;
 }
 
 bool StubNotificationUIManager::CancelAllByProfile(Profile* profile) {
   return false;
 }
 
 void StubNotificationUIManager::CancelAll() {}