cleanup/ Remove deprecated extension notification from policy_browsertest.cc

chrome/browser/policy/policy_browsertest.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 <algorithm>
 #include <string>
 #include <vector>
 
 #include "ash/display/display_manager.h"
 #include "base/bind.h"
@@ skipping 1820 matching lines @@
   GURL url(URLRequestMockHTTPJob::GetMockUrl(path));
 
   // Setting the forcelist extension should install "good_v1.crx".
   base::ListValue forcelist;
   forcelist.Append(new base::StringValue(
       base::StringPrintf("%s;%s", kGoodCrxId, url.spec().c_str())));
   PolicyMap policies;
   policies.Set(key::kExtensionInstallForcelist, POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, forcelist.DeepCopy(),
                nullptr);
-  content::WindowedNotificationObserver observer(
-      extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED,
-      content::NotificationService::AllSources());
+  extensions::TestExtensionRegistryObserver observer(
+      extensions::ExtensionRegistry::Get(browser()->profile()));
   UpdateProviderPolicy(policies);
-  observer.Wait();
+  observer.WaitForExtensionWillBeInstalled();
   // Note: Cannot check that the notification details match the expected
   // exception, since the details object has already been freed prior to
-  // the completion of observer.Wait().
+  // the completion of observer.WaitForExtensionWillBeInstalled().
 
   EXPECT_TRUE(service->GetExtensionById(kGoodCrxId, true));
 
   // The user is not allowed to uninstall force-installed extensions.
   UninstallExtension(kGoodCrxId, false);
 
   // The user is not allowed to load an unpacked extension with the
   // same ID as a force-installed extension.
   LoadUnpackedExtension(kGoodUnpackedExt, false);
 
@@ skipping 10 matching lines @@
       "update.extension",
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
   interceptor.PushJobCallback(
       TestRequestInterceptor::FileJob(
           test_path.Append(kTestExtensionsDir).Append(kGood2CrxManifestName)));
 
   // Updating the force-installed extension.
   extensions::ExtensionUpdater* updater = service->updater();
   extensions::ExtensionUpdater::CheckParams params;
   params.install_immediately = true;
-  content::WindowedNotificationObserver update_observer(
-      extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED,
-      content::NotificationService::AllSources());
+  extensions::TestExtensionRegistryObserver update_observer(
+      extensions::ExtensionRegistry::Get(browser()->profile()));
   updater->CheckNow(params);
-  update_observer.Wait();
+  update_observer.WaitForExtensionWillBeInstalled();
 
   const base::Version* new_version =
       service->GetExtensionById(kGoodCrxId, true)->version();
   ASSERT_TRUE(new_version->IsValid());
   base::Version old_version(old_version_number);
   ASSERT_TRUE(old_version.IsValid());
 
   EXPECT_EQ(1, new_version->CompareTo(old_version));
 
   EXPECT_EQ(0u, interceptor.GetPendingSize());
@@ skipping 58 matching lines @@
   dict_value.SetString(
       std::string(kGoodCrxId) + "." + extensions::schema_constants::kUpdateUrl,
       url.spec());
   PolicyMap policies;
   policies.Set(key::kExtensionSettings,
                POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER,
                POLICY_SOURCE_CLOUD,
                dict_value.DeepCopy(),
                NULL);
-  content::WindowedNotificationObserver observer(
-      extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED,
-      content::NotificationService::AllSources());
+  extensions::TestExtensionRegistryObserver observer(
+      extensions::ExtensionRegistry::Get(browser()->profile()));
   UpdateProviderPolicy(policies);
-  observer.Wait();
+  observer.WaitForExtensionWillBeInstalled();
 
   EXPECT_TRUE(service->GetExtensionById(kGoodCrxId, true));
 
   // The user is not allowed to uninstall recommended-installed extensions.
   UninstallExtension(kGoodCrxId, false);
 
   // Explictly re-enables the extension.
   service->EnableExtension(kGoodCrxId);
 
   // But the user is allowed to disable them.
@@ skipping 69 matching lines @@
   // Install the policy and trigger another download.
   base::ListValue install_sources;
   install_sources.AppendString(install_source_url.spec());
   install_sources.AppendString(referrer_url.spec());
   PolicyMap policies;
   policies.Set(key::kExtensionInstallSources, POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
                install_sources.DeepCopy(), nullptr);
   UpdateProviderPolicy(policies);
 
-  content::WindowedNotificationObserver observer(
-      extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED,
-      content::NotificationService::AllSources());
+  extensions::TestExtensionRegistryObserver observer(
+      extensions::ExtensionRegistry::Get(browser()->profile()));
   PerformClick(1, 0);
-  observer.Wait();
+  observer.WaitForExtensionWillBeInstalled();
   // Note: Cannot check that the notification details match the expected
   // exception, since the details object has already been freed prior to
-  // the completion of observer.Wait().
+  // the completion of observer.WaitForExtensionWillBeInstalled().
 
   // The first extension shouldn't be present, the second should be there.
   EXPECT_FALSE(extension_service()->GetExtensionById(kGoodCrxId, true));
   EXPECT_TRUE(extension_service()->GetExtensionById(kAdBlockCrxId, false));
 }
 
 // Verifies that extensions with version older than the minimum version required
 // by policy will get disabled, and will be auto-updated and/or re-enabled upon
 // policy changes as well as regular auto-updater scheduled updates.
 IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionMinimumVersionRequired) {
@@ skipping 44 matching lines @@
   EXPECT_EQ(1u, interceptor.GetPendingSize());
 
   EXPECT_TRUE(registry->disabled_extensions().Contains(kGoodCrxId));
   EXPECT_EQ(extensions::Extension::DISABLE_UPDATE_REQUIRED_BY_POLICY,
             extension_prefs->GetDisableReasons(kGoodCrxId));
 
   // Provide a new version (1.0.0.1) which is expected to be auto updated to
   // via the update URL in the manifest of the older version.
   EXPECT_EQ(1u, interceptor.GetPendingSize());
   {
-    content::WindowedNotificationObserver update_observer(
-        extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED,
-        content::NotificationService::AllSources());
+    extensions::TestExtensionRegistryObserver update_observer(
+        extensions::ExtensionRegistry::Get(browser()->profile()));
     service->updater()->CheckSoon();
-    update_observer.Wait();
+    update_observer.WaitForExtensionWillBeInstalled();
   }
   EXPECT_EQ(0u, interceptor.GetPendingSize());
 
   // The extension should be auto-updated to newer version and re-enabled.
   EXPECT_EQ("1.0.0.1",
             service->GetInstalledExtension(kGoodCrxId)->version()->GetString());
   EXPECT_TRUE(registry->enabled_extensions().Contains(kGoodCrxId));
 }
 
 // Similar to ExtensionMinimumVersionRequired test, but with different settings
@@ skipping 28 matching lines @@
   EXPECT_TRUE(InstallExtension(kGoodV1CrxName));
   EXPECT_TRUE(registry->disabled_extensions().Contains(kGoodCrxId));
   EXPECT_EQ(extensions::Extension::DISABLE_UPDATE_REQUIRED_BY_POLICY,
             extension_prefs->GetDisableReasons(kGoodCrxId));
   EXPECT_EQ("1.0.0.0",
             service->GetInstalledExtension(kGoodCrxId)->version()->GetString());
 
   // An extension management policy update should trigger an update as well.
   EXPECT_EQ(1u, interceptor.GetPendingSize());
   {
-    content::WindowedNotificationObserver update_observer(
-        extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED,
-        content::NotificationService::AllSources());
+    extensions::TestExtensionRegistryObserver update_observer(
+        extensions::ExtensionRegistry::Get(browser()->profile()));
     {
       // Set a higher minimum version, just intend to trigger a policy update.
       extensions::ExtensionManagementPolicyUpdater management_policy(
           &provider_);
       management_policy.SetMinimumVersionRequired(kGoodCrxId, "1.0.0.3");
     }
     base::RunLoop().RunUntilIdle();
-    update_observer.Wait();
+    update_observer.WaitForExtensionWillBeInstalled();
   }
   EXPECT_EQ(0u, interceptor.GetPendingSize());
 
   // It should be updated to 1.0.0.1 but remain disabled.
   EXPECT_EQ("1.0.0.1",
             service->GetInstalledExtension(kGoodCrxId)->version()->GetString());
   EXPECT_TRUE(registry->disabled_extensions().Contains(kGoodCrxId));
   EXPECT_EQ(extensions::Extension::DISABLE_UPDATE_REQUIRED_BY_POLICY,
             extension_prefs->GetDisableReasons(kGoodCrxId));
 
@@ skipping 17 matching lines @@
   extensions::ExtensionPrefs* extension_prefs =
       extensions::ExtensionPrefs::Get(browser()->profile());
 
   // Prepare the update URL for force installing.
   const base::FilePath path =
       base::FilePath(kTestExtensionsDir).Append(kGoodV1CrxManifestName);
   const GURL url(URLRequestMockHTTPJob::GetMockUrl(path));
 
   // Set policy to force-install the extension, it should be installed and
   // enabled.
-  content::WindowedNotificationObserver install_observer(
-      extensions::NOTIFICATION_EXTENSION_WILL_BE_INSTALLED_DEPRECATED,
-      content::NotificationService::AllSources());
+  extensions::TestExtensionRegistryObserver install_observer(
+      extensions::ExtensionRegistry::Get(browser()->profile()));
   EXPECT_FALSE(registry->enabled_extensions().Contains(kGoodCrxId));
   {
     extensions::ExtensionManagementPolicyUpdater management_policy(&provider_);
     management_policy.SetIndividualExtensionAutoInstalled(kGoodCrxId,
                                                           url.spec(), true);
   }
   base::RunLoop().RunUntilIdle();
-  install_observer.Wait();
+  install_observer.WaitForExtensionWillBeInstalled();
 
   EXPECT_TRUE(registry->enabled_extensions().Contains(kGoodCrxId));
 
   // Set policy a minimum version of "1.0.0.1", the extension now should be
   // disabled.
   {
     extensions::ExtensionManagementPolicyUpdater management_policy(&provider_);
     management_policy.SetMinimumVersionRequired(kGoodCrxId, "1.0.0.1");
   }
   base::RunLoop().RunUntilIdle();
@@ skipping 1750 matching lines @@
                POLICY_SCOPE_USER,
                POLICY_SOURCE_CLOUD,
                new base::FundamentalValue(false),
                NULL);
   UpdateProviderPolicy(policies);
   EXPECT_FALSE(display_manager->unified_desktop_enabled());
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace policy