CPM Extension Uninstall Watching

chrome/browser/extensions/app_notification_manager_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 "base/bind.h"
 #include "base/message_loop.h"
 #include "chrome/browser/extensions/app_notification_manager.h"
 #include "chrome/browser/extensions/app_notification_test_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_test_util.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
+using extensions::Extension;
 
 namespace util = app_notification_test_util;
 
 class AppNotificationManagerTest : public testing::Test {
  public:
   AppNotificationManagerTest()
       : ui_thread_(BrowserThread::UI, &ui_loop_),
         file_thread_(BrowserThread::FILE) {}
 
   ~AppNotificationManagerTest() {}
@@ skipping 62 matching lines @@
   util::ExpectListsEqual(list, *tmp_list);
   mgr_->ClearAll(id);
   EXPECT_EQ(NULL, mgr_->GetLast(id));
   EXPECT_EQ(NULL, mgr_->GetAll(id));
 }
 
 // Test that AppNotificationManager correctly listens to EXTENSION_UNINSTALLED
 // notifications and removes associated data when that happens.
 TEST_F(AppNotificationManagerTest, ExtensionUninstall) {
   // Add some items from two test extension ids.
-  std::string id1 = extension_test_util::MakeId("id1");
-  std::string id2 = extension_test_util::MakeId("id2");
+  scoped_refptr<Extension> extension1 =
+      extension_test_util::CreateExtensionWithID("id1");
+  scoped_refptr<Extension> extension2 =
+      extension_test_util::CreateExtensionWithID("id2");
+  std::string id1 = extension1->id();
+  std::string id2 = extension2->id();
   AppNotificationList list1;
   AppNotificationList list2;
   util::AddNotifications(&list1, id1, 5, "foo1");
   util::AddNotifications(&list2, id2, 3, "foo2");
   util::AddCopiesFromList(mgr_.get(), list1);
   util::AddCopiesFromList(mgr_.get(), list2);
   util::ExpectListsEqual(list1, *mgr_->GetAll(id1));
   util::ExpectListsEqual(list2, *mgr_->GetAll(id2));
 
   // Send the uninstall notification for extension id1.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
       content::Source<Profile>(profile_.get()),
-      content::Details<const std::string>(&id1));
+      content::Details<const Extension>(extension1.get()));
 
   // The id1 items should be gone but the id2 items should still be there.
   EXPECT_EQ(NULL, mgr_->GetLast(id1));
   EXPECT_EQ(NULL, mgr_->GetAll(id1));
   util::ExpectListsEqual(list2, *mgr_->GetAll(id2));
 }