Index: chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc |
diff --git a/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc b/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc |
index 2fa07a877d151e135f45f4b84d60b33ced3116ab..7f1d08a706843386220df45a3e0602f17f752a94 100644 |
--- a/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc |
+++ b/chrome/browser/chromeos/first_run/drive_first_run_browsertest.cc |
@@ -10,14 +10,11 @@ |
#include "base/path_service.h" |
#include "base/strings/string_number_conversions.h" |
#include "chrome/browser/chromeos/first_run/drive_first_run_controller.h" |
-#include "chrome/browser/extensions/chrome_extension_test_notification_observer.h" |
-#include "chrome/browser/extensions/crx_installer.h" |
-#include "chrome/browser/extensions/extension_service.h" |
+#include "chrome/browser/extensions/chrome_test_extension_loader.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/common/chrome_paths.h" |
#include "chrome/test/base/in_process_browser_test.h" |
#include "content/public/test/test_utils.h" |
-#include "extensions/browser/extension_system.h" |
#include "net/dns/mock_host_resolver.h" |
#include "net/http/http_status_code.h" |
#include "net/test/embedded_test_server/embedded_test_server.h" |
@@ -123,16 +120,9 @@ void DriveFirstRunTest::InitTestServer(const std::string& directory) { |
} |
void DriveFirstRunTest::InstallApp() { |
- ExtensionService* extension_service = extensions::ExtensionSystem::Get( |
- browser()->profile())->extension_service(); |
- scoped_refptr<extensions::CrxInstaller> installer = |
- extensions::CrxInstaller::CreateSilent(extension_service); |
- |
- installer->InstallCrx(test_data_dir_.AppendASCII(kTestAppCrxName)); |
- extensions::ChromeExtensionTestNotificationObserver observer(browser()); |
- observer.WaitForExtensionLoad(); |
- |
- ASSERT_TRUE(extension_service->GetExtensionById(kTestAppId, false)); |
+ extensions::ChromeTestExtensionLoader loader(browser()->profile()); |
+ ASSERT_TRUE( |
+ loader.LoadExtension(test_data_dir_.AppendASCII(kTestAppCrxName))); |
} |
void DriveFirstRunTest::EnableOfflineMode() { |