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

chrome/browser/component_updater/test/component_updater_service_unittest.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 <list>
 #include <utility>
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 110 matching lines @@
 
 void TestConfigurator::AddComponentToCheck(CrxComponent* com,
                                            int at_loop_iter) {
   components_to_check_.push_back(std::make_pair(com, at_loop_iter));
 }
 
 void TestConfigurator::SetComponentUpdateService(ComponentUpdateService* cus) {
   cus_ = cus;
 }
 
+TestUpdateNotificationTracker::TestUpdateNotificationTracker() {}
+
+TestUpdateNotificationTracker::~TestUpdateNotificationTracker() {}
+
+std::string TestUpdateNotificationTracker::SourceAt(size_t num) {
+  return sources_[num];
+}
+
+void TestUpdateNotificationTracker::Observe(
+    int type,
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
+  if (type == chrome::NOTIFICATION_COMPONENT_UPDATE_FOUND
+      || type == chrome::NOTIFICATION_COMPONENT_UPDATE_READY) {
+    sources_.push_back(std::string(
+        *content::Source<std::string>(source).ptr()));
+  } else
+    sources_.push_back(std::string());
+  TestNotificationTracker::Observe(type, source, details);
+}
+
+void TestUpdateNotificationTracker::Reset() {
+  sources_.clear();
+  TestNotificationTracker::Reset();
+}
+
 ComponentUpdaterTest::ComponentUpdaterTest() : test_config_(NULL) {
   // The component updater instance under test.
   test_config_ = new TestConfigurator;
   component_updater_.reset(ComponentUpdateServiceFactory(test_config_));
   test_config_->SetComponentUpdateService(component_updater_.get());
   // The test directory is chrome/test/data/components.
   PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
   test_data_dir_ = test_data_dir_.AppendASCII("components");
 
   // Subscribe to all component updater notifications.
@@ skipping 21 matching lines @@
 
 ComponentUpdateService* ComponentUpdaterTest::component_updater() {
   return component_updater_.get();
 }
 
   // Makes the full path to a component updater test file.
 const base::FilePath ComponentUpdaterTest::test_file(const char* file) {
   return test_data_dir_.AppendASCII(file);
 }
 
-TestNotificationTracker& ComponentUpdaterTest::notification_tracker() {
+TestUpdateNotificationTracker& ComponentUpdaterTest::notification_tracker() {
   return notification_tracker_;
 }
 
 TestConfigurator* ComponentUpdaterTest::test_configurator() {
   return test_config_;
 }
 
 ComponentUpdateService::Status ComponentUpdaterTest::RegisterComponent(
     CrxComponent* com,
     TestComponents component,
@@ skipping 164 matching lines @@
   EXPECT_EQ(0, static_cast<TestInstaller*>(com1.installer)->error());
   EXPECT_EQ(1, static_cast<TestInstaller*>(com1.installer)->install_count());
   EXPECT_EQ(0, static_cast<TestInstaller*>(com2.installer)->error());
   EXPECT_EQ(0, static_cast<TestInstaller*>(com2.installer)->install_count());
 
   EXPECT_EQ(3, interceptor.GetHitCount());
 
   ASSERT_EQ(5ul, notification_tracker().size());
 
   TestNotificationTracker::Event ev1 = notification_tracker().at(1);
+  std::string source1 = notification_tracker().SourceAt(1);
   EXPECT_EQ(chrome::NOTIFICATION_COMPONENT_UPDATE_FOUND, ev1.type);
+  // Check that the UPDATE_FOUND is for com1.
+  EXPECT_FALSE(ComponentUpdateService::IsUpdateNotificationForComponent(
+      content::Source<std::string>(&source1), com2));
+  EXPECT_TRUE(ComponentUpdateService::IsUpdateNotificationForComponent(
+      content::Source<std::string>(&source1), com1));
 
   TestNotificationTracker::Event ev2 = notification_tracker().at(2);
+  std::string source2 = notification_tracker().SourceAt(2);
   EXPECT_EQ(chrome::NOTIFICATION_COMPONENT_UPDATE_READY, ev2.type);
+  // Check that the UPDATE_READY is for com1.
+  EXPECT_FALSE(ComponentUpdateService::IsUpdateNotificationForComponent(
+      content::Source<std::string>(&source2), com2));
+  EXPECT_TRUE(ComponentUpdateService::IsUpdateNotificationForComponent(
+      content::Source<std::string>(&source2), com1));
 
   TestNotificationTracker::Event ev3 = notification_tracker().at(3);
   EXPECT_EQ(chrome::NOTIFICATION_COMPONENT_UPDATER_SLEEPING, ev3.type);
 
   TestNotificationTracker::Event ev4 = notification_tracker().at(4);
   EXPECT_EQ(chrome::NOTIFICATION_COMPONENT_UPDATER_SLEEPING, ev4.type);
 
   component_updater()->Stop();
 }
 
@@ skipping 388 matching lines @@
   component_updater()->Start();
   message_loop.Run();
 
   EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
   EXPECT_EQ(2, static_cast<TestInstaller*>(com.installer)->install_count());
 
   EXPECT_EQ(6, interceptor.GetHitCount());
 
   component_updater()->Stop();
 }