Remove ...LOADED_DEPRECATED and its friends

chrome/browser/chromeos/policy/device_cloud_policy_browsertest.cc

 // Copyright 2014 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 <memory>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/dir_reader_posix.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/test/null_task_runner.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/extensions/signin_screen_policy_provider.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_policy_builder.h"
 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
+#include "chrome/browser/extensions/chrome_test_extension_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/policy/test/local_policy_test_server.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_constants.cc"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/chromeos_paths.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
 #include "components/ownership/owner_key_util.h"
 #include "components/policy/core/browser/browser_policy_connector.h"
 #include "components/policy/core/common/cloud/cloud_policy_client.h"
 #include "components/policy/core/common/cloud/device_management_service.h"
 #include "components/policy/core/common/cloud/mock_cloud_policy_client.h"
 #include "components/policy/core/common/cloud/policy_builder.h"
 #include "components/policy/core/common/cloud/resource_cache.h"
 #include "components/policy/core/common/policy_service.h"
 #include "components/policy/core/common/policy_switches.h"
 #include "components/policy/policy_constants.h"
 #include "components/policy/proto/chrome_extension_policy.pb.h"
 #include "components/policy/proto/device_management_backend.pb.h"
 #include "crypto/rsa_private_key.h"
 #include "crypto/sha2.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
-#include "extensions/test/extension_test_notification_observer.h"
 #include "extensions/test/result_catcher.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace policy {
 
 namespace {
 
@@ skipping 306 matching lines @@
 // The fake component policy is injected by using the local policy test server.
 // The test extension is installed into the profile manually by the test code
 // (i.e. this class doesn't test the installation of the signin screen
 // extensions through the admin policy).
 class SigninExtensionsDeviceCloudPolicyBrowserTest
     : public SigninExtensionsDeviceCloudPolicyBrowserTestBase {
  protected:
   SigninExtensionsDeviceCloudPolicyBrowserTest()
       : fetcher_factory_(&fetcher_impl_factory_) {}
 
-  const extensions::Extension* InstallAndLoadTestExtension() const {
-    Profile* signin_profile = GetSigninProfile();
-    ExtensionService* service =
-        extensions::ExtensionSystem::Get(signin_profile)->extension_service();
-    scoped_refptr<extensions::UnpackedInstaller> installer(
-        extensions::UnpackedInstaller::Create(service));
-    extensions::ExtensionTestNotificationObserver observer(signin_profile);
-    installer->Load(GetTestExtensionSourcePath());
-    observer.WaitForExtensionLoad();
-    return GetTestExtension();
+  scoped_refptr<const extensions::Extension> InstallAndLoadTestExtension()
+      const {
+    extensions::ChromeTestExtensionLoader loader(GetSigninProfile());
+    return loader.LoadExtension(GetTestExtensionSourcePath());
   }
 
  private:
   void SetUp() override {
     StartPolicyTestServer();
     DevicePolicyCrosBrowserTest::SetUp();
   }
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     SigninExtensionsDeviceCloudPolicyBrowserTestBase::SetUpCommandLine(
@@ skipping 47 matching lines @@
   net::URLFetcherImplFactory fetcher_impl_factory_;
   net::FakeURLFetcherFactory fetcher_factory_;
   base::FilePath component_policy_cache_dir_;
   std::unique_ptr<base::AutoReset<bool>> signin_policy_provided_disabler_;
 };
 
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(SigninExtensionsDeviceCloudPolicyBrowserTest,
                        InstallAndRunInWindow) {
-  const extensions::Extension* extension = InstallAndLoadTestExtension();
+  scoped_refptr<const extensions::Extension> extension =
+      InstallAndLoadTestExtension();
   ASSERT_TRUE(extension);
   Browser* browser = CreateBrowser(GetSigninProfile());
   extensions::ResultCatcher result_catcher;
   ui_test_utils::NavigateToURL(
       browser, extension->GetResourceURL(kTestExtensionTestPage));
   EXPECT_TRUE(result_catcher.GetNextResult());
   CloseBrowserSynchronously(browser);
 }
 
 namespace {
@@ skipping 71 matching lines @@
   ASSERT_TRUE(extension);
   Browser* browser = CreateBrowser(GetSigninProfile());
   extensions::ResultCatcher result_catcher;
   ui_test_utils::NavigateToURL(
       browser, extension->GetResourceURL(kTestExtensionTestPage));
   EXPECT_TRUE(result_catcher.GetNextResult());
   CloseBrowserSynchronously(browser);
 }
 
 }  // namespace policy