Fix app_shell shutdown crash due to BrowserContextKeyedServices

apps/shell/shell_browser_main_parts.h

 // 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.
 
 #ifndef APPS_SHELL_SHELL_BROWSER_MAIN_PARTS_H_
 #define APPS_SHELL_SHELL_BROWSER_MAIN_PARTS_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/browser_main_parts.h"
 #include "ui/aura/root_window_observer.h"
 
 namespace aura {
 class TestScreen;
 }
 
 namespace content {
 class ShellBrowserContext;
 struct MainFunctionParams;
 }
 
 namespace extensions {
+class ShellExtensionsBrowserClient;
 class ShellExtensionSystem;
 }
 
 namespace wm {
 class WMTestHelper;
 }
 
 namespace apps {
 
 class ShellBrowserContext;
-class ShellExtensionsBrowserClient;
 class ShellExtensionsClient;
 
 // Handles initialization of AppShell.
 class ShellBrowserMainParts : public content::BrowserMainParts,
                               public aura::RootWindowObserver {
  public:
   explicit ShellBrowserMainParts(
       const content::MainFunctionParams& parameters);
   virtual ~ShellBrowserMainParts();
 
@@ skipping 19 matching lines @@
   void CreateRootWindow();
 
   // Closes and destroys the root window hosting the app.
   void DestroyRootWindow();
 
   // Creates and initializes the ExtensionSystem.
   void CreateExtensionSystem();
 
   scoped_ptr<ShellBrowserContext> browser_context_;
   scoped_ptr<ShellExtensionsClient> extensions_client_;
-  scoped_ptr<ShellExtensionsBrowserClient> extensions_browser_client_;
+  scoped_ptr<extensions::ShellExtensionsBrowserClient>
+      extensions_browser_client_;
 
   // Enable a minimal set of views::corewm to be initialized.
   scoped_ptr<wm::WMTestHelper> wm_test_helper_;
 
   scoped_ptr<aura::TestScreen> test_screen_;
 
   // Owned by the BrowserContextKeyedService system.
   extensions::ShellExtensionSystem* extension_system_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
 };
 
 }  // namespace apps
 
 #endif  // APPS_SHELL_SHELL_BROWSER_MAIN_PARTS_H_