Remove ShellExtensionSystem::LaunchApp

extensions/shell/test/shell_apitest.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 "extensions/shell/test/shell_apitest.h"
 
+#include "apps/launcher.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/notification_types.h"
+#include "extensions/common/constants.h"
 #include "extensions/common/extension_paths.h"
 #include "extensions/shell/browser/shell_extension_system.h"
 #include "extensions/test/result_catcher.h"
 
 namespace extensions {
 
 ShellApiTest::ShellApiTest() {
 }
 
 ShellApiTest::~ShellApiTest() {
 }
 
 const Extension* ShellApiTest::LoadApp(const std::string& app_dir) {
   base::ThreadRestrictions::ScopedAllowIO allow_io;
   base::FilePath test_data_dir;
   PathService::Get(extensions::DIR_TEST_DATA, &test_data_dir);
   test_data_dir = test_data_dir.AppendASCII(app_dir);
 
   const Extension* extension = extension_system_->LoadApp(test_data_dir);
   if (!extension)
     return NULL;
 
-  extension_system_->LaunchApp(extension->id());
+  apps::LaunchPlatformApp(browser_context(), extension,
+                          extensions::SOURCE_UNTRACKED);
 
   return extension;
 }
 
 bool ShellApiTest::RunAppTest(const std::string& app_dir) {
   ResultCatcher catcher;
 
   const Extension* extension = LoadApp(app_dir);
   if (!extension)
     return false;
@@ skipping 13 matching lines @@
   UnloadedExtensionReason reason(UnloadedExtensionReason::DISABLE);
   registry->TriggerOnUnloaded(app, reason);
 
   content::NotificationService::current()->Notify(
       extensions::NOTIFICATION_EXTENSION_REMOVED,
       content::Source<content::BrowserContext>(browser_context()),
       content::Details<const Extension>(app));
 }
 
 }  // namespace extensions