Consistently use notifications from component updater w/ on-demand PNaCl.

chrome/browser/component_updater/component_updater_service.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/component_updater/component_updater_service.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 835 matching lines @@
     crx->size = it->size;
     crx->diff_crx_url = it->diff_crx_url;
     crx->diff_size = it->diff_size;
     crx->status = CrxUpdateItem::kCanUpdate;
     crx->next_version = Version(it->version);
     crx->next_fp = it->package_fingerprint;
     ++update_pending;
 
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_COMPONENT_UPDATE_FOUND,
-        content::Source<std::string>(&crx->id),
+        content::Source<UpdateSource>(&crx->id),
         content::NotificationService::NoDetails());
   }
 
   // All the components that are not mentioned in the manifest we
   // consider them up to date.
   ChangeItemStatus(CrxUpdateItem::kChecking, CrxUpdateItem::kUpToDate);
 
   // If there are updates pending we do a short wait.
   ScheduleNextRun(update_pending > 0);
 }
@@ skipping 47 matching lines @@
     } else {
       count = ChangeItemStatus(CrxUpdateItem::kDownloading,
                                CrxUpdateItem::kUpdating);
     }
     DCHECK_EQ(count, 1ul);
 
     url_fetcher_.reset();
 
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_COMPONENT_UPDATE_READY,
-        content::Source<std::string>(&context->id),
+        content::Source<UpdateSource>(&context->id),
         content::NotificationService::NoDetails());
 
     // Why unretained? See comment at top of file.
     BrowserThread::PostDelayedTask(
         BrowserThread::FILE,
         FROM_HERE,
         base::Bind(&CrxUpdateService::Install,
                    base::Unretained(this),
                    context,
                    temp_crx_path),
@@ skipping 62 matching lines @@
       break;
     default:
       event = Configurator::kUnpackError;
       break;
   }
 
   config_->OnEvent(event, CrxIdtoUMAId(component_id));
   ScheduleNextRun(false);
 }
 
+bool ComponentUpdateService::IsUpdateNotificationForComponent(
+    const content::NotificationSource& src,
+    const CrxComponent& component) {
+  std::string id =
+      HexStringToID(StringToLowerASCII(base::HexEncode(&component.pk_hash[0],
+                                       component.pk_hash.size()/2)));
+  return content::Source<UpdateSource>(src)->compare(id) == 0;
+}
+
 // The component update factory. Using the component updater as a singleton
 // is the job of the browser process.
 ComponentUpdateService* ComponentUpdateServiceFactory(
     ComponentUpdateService::Configurator* config) {
   DCHECK(config);
   return new CrxUpdateService(config);
 }