Use ExtensionRegistryObserver instead of deprecated extension notification from autocomplete

chrome/browser/autocomplete/shortcuts_provider_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 "chrome/browser/autocomplete/shortcuts_provider.h"
 
 #include <math.h>
 
 #include <algorithm>
 #include <functional>
@@ skipping 14 matching lines @@
 #include "chrome/browser/autocomplete/shortcuts_backend.h"
 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/in_memory_url_index.h"
 #include "chrome/browser/history/url_database.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_browser_thread.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/value_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ASCIIToUTF16;
 
 // TestShortcutInfo -----------------------------------------------------------
 
 namespace {
@@ skipping 236 matching lines @@
 
   // Passthrough to the private function in provider_.
   int CalculateScore(const std::string& terms,
                      const history::ShortcutsDatabase::Shortcut& shortcut,
                      int max_relevance);
 
   base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 
-  TestingProfile profile_;
+  scoped_ptr<TestingProfile> profile_;
 
   ACMatches ac_matches_;  // The resulting matches after running RunTest.
 
   scoped_refptr<ShortcutsBackend> backend_;
   scoped_refptr<ShortcutsProvider> provider_;
 };
 
 ShortcutsProviderTest::ShortcutsProviderTest()
     : ui_thread_(content::BrowserThread::UI, &message_loop_),
-      file_thread_(content::BrowserThread::FILE, &message_loop_) {
+      file_thread_(content::BrowserThread::FILE, &message_loop_),
+      profile_(new TestingProfile) {

[not at google - send to devlin, 2014/05/12 17:59:00]

ditto, though in this case it's basically the same behaviour; any reason you
needed to change this to a pointer?

[Peter Kasting, 2014/05/12 19:46:55]

I'm wondering this too.

[limasdf, 2014/05/13 14:38:44]

for consistent with extension_app_provider_unittest.cc.
But on second thought, I shouldn't touch this which is not a part of purpose of
this CL.
back to original, not pointer. Done.

 }
 
 void ShortcutsProviderTest::OnProviderUpdate(bool updated_matches) {}
 
 void ShortcutsProviderTest::SetUp() {
   ShortcutsBackendFactory::GetInstance()->SetTestingFactoryAndUse(
-      &profile_, &ShortcutsBackendFactory::BuildProfileNoDatabaseForTesting);
-  backend_ = ShortcutsBackendFactory::GetForProfile(&profile_);
+      profile_.get(),
+      &ShortcutsBackendFactory::BuildProfileNoDatabaseForTesting);
+  backend_ = ShortcutsBackendFactory::GetForProfile(profile_.get());
   ASSERT_TRUE(backend_.get());
-  ASSERT_TRUE(profile_.CreateHistoryService(true, false));
-  provider_ = new ShortcutsProvider(this, &profile_);
+  ASSERT_TRUE(profile_.get()->CreateHistoryService(true, false));

[Peter Kasting, 2014/05/12 19:46:55]

There's no need to use "get()" before "->".

[limasdf, 2014/05/13 14:38:44]

back to original. Done.

+  provider_ = new ShortcutsProvider(this, profile_.get());
   FillData(shortcut_test_db, arraysize(shortcut_test_db));
 }
 
 void ShortcutsProviderTest::TearDown() {
   // Run all pending tasks or else some threads hold on to the message loop
   // and prevent it from being deleted.
   message_loop_.RunUntilIdle();
   provider_ = NULL;
 }
 
@@ skipping 511 matching lines @@
   RunTest(text, false, expected_urls, expected_url, ASCIIToUTF16(" echo"));
 
   // Claim the extension has been unloaded.
   scoped_refptr<const extensions::Extension> extension =
       extensions::ExtensionBuilder()
           .SetManifest(extensions::DictionaryBuilder()
               .Set("name", "Echo")
               .Set("version", "1.0"))
           .SetID("cedabbhfglmiikkmdgcpjdkocfcmbkee")
           .Build();
-  extensions::UnloadedExtensionInfo details(
+  extensions::ExtensionRegistry* registry =
+      extensions::ExtensionRegistry::Get(profile_.get());
+  registry->TriggerOnUnloaded(
       extension.get(), extensions::UnloadedExtensionInfo::REASON_UNINSTALL);
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-      content::Source<Profile>(&profile_),
-      content::Details<extensions::UnloadedExtensionInfo>(&details));
 
   // Now the URL should have disappeared.
   RunTest(text, false, ExpectedURLs(), std::string(), base::string16());
 }