Revert 215753 "Move native_app_window code to apps areas"

trunk/src/chrome/browser/extensions/platform_app_browsertest_util.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/platform_app_browsertest_util.h"
 
 #include "apps/app_window_contents.h"
-#include "apps/native_app_window.h"
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/ui/apps/chrome_shell_window_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
+#include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/common/switches.h"
 
 using apps::ShellWindow;
 using content::WebContents;
 
 namespace utils = extension_function_test_utils;
 
 namespace extensions {
 
 PlatformAppBrowserTest::PlatformAppBrowserTest() {
-  ChromeShellWindowDelegate::DisableExternalOpenForTesting();
+  chrome::ChromeShellWindowDelegate::DisableExternalOpenForTesting();
 }
 
 void PlatformAppBrowserTest::SetUpCommandLine(CommandLine* command_line) {
   // Skips ExtensionApiTest::SetUpCommandLine.
   ExtensionBrowserTest::SetUpCommandLine(command_line);
 
   // Make event pages get suspended quicker.
   command_line->AppendSwitchASCII(::switches::kEventPageIdleTime, "1");
   command_line->AppendSwitchASCII(::switches::kEventPageSuspendingTime, "1");
 }
@@ skipping 105 matching lines @@
   command_line->AppendArgPath(test_doc);
 }
 
 ShellWindow* PlatformAppBrowserTest::CreateShellWindow(
     const Extension* extension) {
   return CreateShellWindowFromParams(extension, ShellWindow::CreateParams());
 }
 
 ShellWindow* PlatformAppBrowserTest::CreateShellWindowFromParams(
     const Extension* extension, const ShellWindow::CreateParams& params) {
-  ShellWindow* window = new ShellWindow(browser()->profile(),
-                                        new ChromeShellWindowDelegate(),
-                                        extension);
+  ShellWindow* window = new ShellWindow(
+      browser()->profile(),
+      new chrome::ChromeShellWindowDelegate(),
+      extension);
   window->Init(GURL(std::string()),
                new apps::AppWindowContents(window),
                params);
   return window;
 }
 
 void PlatformAppBrowserTest::CloseShellWindow(ShellWindow* window) {
   content::WindowedNotificationObserver destroyed_observer(
       content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
       content::NotificationService::AllSources());
@@ skipping 15 matching lines @@
                                           bounds);
 }
 
 void ExperimentalPlatformAppBrowserTest::SetUpCommandLine(
     CommandLine* command_line) {
   PlatformAppBrowserTest::SetUpCommandLine(command_line);
   command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
 }
 
 }  // namespace extensions