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

chrome/browser/component_updater/test/component_updater_service_unittest.h

 // 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.
 
 #ifndef CHROME_BROWSER_COMPONENT_UPDATER_TEST_COMPONENT_UPDATER_SERVICE_UNITTEST_H_
 #define CHROME_BROWSER_COMPONENT_UPDATER_TEST_COMPONENT_UPDATER_SERVICE_UNITTEST_H_
 
 #include <list>
 #include <utility>
 
@@ skipping 75 matching lines @@
 
  private:
   int times_;
   int recheck_time_;
   int ondemand_time_;
 
   std::list<CheckAtLoopCount> components_to_check_;
   ComponentUpdateService* cus_;
 };
 
+// TestNotificationTracker does not keep a deep copy of the source,
+// so we will need to for testing. The test does not inspect the observations
+// as they occur -- only post mortem.  Otherwise, the tester will end up
+// dereferencing an already-free'd pointer.

[Sorin Jianu, 2013/07/03 21:17:32]

free'd

perhaps use a different word such as deleted or deallocated.

[jvoung (off chromium), 2013/07/03 22:51:51]

Done.

+class TestUpdateNotificationTracker : public TestNotificationTracker {
+public:
+  TestUpdateNotificationTracker();
+  virtual ~TestUpdateNotificationTracker();
+
+  std::string SourceAt(size_t num);
+
+  virtual void Reset() OVERRIDE;
+
+private:
+  virtual void Observe(int type,
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details) OVERRIDE;
+
+  std::vector<std::string> sources_;
+};
+
 class ComponentUpdaterTest : public testing::Test {
  public:
   enum TestComponents {
     kTestComponent_abag,
     kTestComponent_jebg,
     kTestComponent_ihfo,
   };
 
   ComponentUpdaterTest();
 
   virtual ~ComponentUpdaterTest();
 
   virtual void TearDown();
 
   ComponentUpdateService* component_updater();
 
   // Makes the full path to a component updater test file.
   const base::FilePath test_file(const char* file);
 
-  TestNotificationTracker& notification_tracker();
+  TestUpdateNotificationTracker& notification_tracker();
 
   TestConfigurator* test_configurator();
 
   ComponentUpdateService::Status RegisterComponent(CrxComponent* com,
                                                    TestComponents component,
                                                    const Version& version,
                                                    TestInstaller* installer);
 
  private:
   scoped_ptr<ComponentUpdateService> component_updater_;
   base::FilePath test_data_dir_;
-  TestNotificationTracker notification_tracker_;
+  TestUpdateNotificationTracker notification_tracker_;
   TestConfigurator* test_config_;
 };
 
 const char expected_crx_url[] =
     "http://localhost/download/jebgalgnebhfojomionfpkfelancnnkf.crx";
 
 #endif  // CHROME_BROWSER_COMPONENT_UPDATER_TEST_COMPONENT_UPDATER_SERVICE_UNITTEST_H_