Allow app_shell to run past extension manifest parsing

apps/shell/shell_browser_main_parts.cc

 // Copyright 2013 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 "apps/shell/shell_browser_main_parts.h"
 
 #include "apps/shell/shell_browser_context.h"
 #include "apps/shell/shell_extension_system.h"
 #include "apps/shell/shell_extensions_browser_client.h"
 #include "apps/shell/shell_extensions_client.h"
 #include "apps/shell/web_view_window.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/extensions/extension_file_util.h"
 #include "chromeos/chromeos_paths.h"
 #include "content/public/common/result_codes.h"
 #include "extensions/common/extension_paths.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/screen.h"
 #include "ui/wm/test/wm_test_helper.h"
 
@@ skipping 58 matching lines @@
 
   // TODO(jamescook): Create the rest of the services using
   // BrowserContextDependencyManager::CreateBrowserContextServices.
 
   CreateRootWindow();
 
   const std::string kAppSwitch = "app";
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(kAppSwitch)) {
     base::FilePath app_dir(command_line->GetSwitchValueNative(kAppSwitch));
-    LoadAndLaunchApp(app_dir);
+    extension_system_->LoadAndLaunchApp(app_dir);
   } else {
     // TODO(jamescook): For demo purposes create a window with a WebView just
     // to ensure that the content module is properly initialized.
     ShowWebViewWindow(browser_context_.get(),
                       wm_test_helper_->root_window()->window());
   }
 }
 
 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code)  {
   base::RunLoop run_loop;
@@ skipping 44 matching lines @@
   DCHECK(browser_context_);
   extension_system_ =
       new extensions::ShellExtensionSystem(browser_context_.get());
   extensions::ExtensionSystemFactory::GetInstance()->SetCustomInstance(
       extension_system_);
   // Must occur after setting the instance above, as it will end up calling
   // ExtensionSystem::Get().
   extension_system_->InitForRegularProfile(true);
 }
 
-bool ShellBrowserMainParts::LoadAndLaunchApp(const base::FilePath& app_dir) {
-  DCHECK(extension_system_);
-  std::string load_error;
-  scoped_refptr<Extension> extension =
-      extension_file_util::LoadExtension(app_dir,
-                                         extensions::Manifest::COMMAND_LINE,
-                                         Extension::NO_FLAGS,
-                                         &load_error);
-  if (!extension) {
-    LOG(ERROR) << "Loading extension at " << app_dir.value()
-        << " failed with: " << load_error;
-    return false;
-  }
-
-  // TODO(jamescook): Add to ExtensionRegistry.
-  // TODO(jamescook): Set ExtensionSystem ready.
-  // TODO(jamescook): Send NOTIFICATION_EXTENSION_LOADED.
-  return true;
-}
-
 }  // namespace apps