Moved CreateNativeAppWindow from AppWindow::Delegate to AppsClient.

chrome/browser/apps/app_browsertest_util.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 "chrome/browser/apps/app_browsertest_util.h"
 
 #include "apps/app_window_contents.h"
 #include "apps/app_window_registry.h"
 #include "apps/ui/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/extension_test_message_listener.h"
 #include "chrome/browser/ui/apps/chrome_app_delegate.h"
-#include "chrome/browser/ui/apps/chrome_app_window_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/common/switches.h"
 
 using apps::AppWindow;
 using apps::AppWindowRegistry;
 using content::WebContents;
@@ skipping 168 matching lines @@
   command_line->AppendArgPath(test_doc);
 }
 
 AppWindow* PlatformAppBrowserTest::CreateAppWindow(const Extension* extension) {
   return CreateAppWindowFromParams(extension, AppWindow::CreateParams());
 }
 
 AppWindow* PlatformAppBrowserTest::CreateAppWindowFromParams(
     const Extension* extension,
     const AppWindow::CreateParams& params) {
-  AppWindow* window = new AppWindow(browser()->profile(),
-                                    new ChromeAppDelegate(),
-                                    new ChromeAppWindowDelegate(),
-                                    extension);
+  AppWindow* window =
+      new AppWindow(browser()->profile(), new ChromeAppDelegate(), extension);
   window->Init(
       GURL(std::string()), new apps::AppWindowContentsImpl(window), params);
   return window;
 }
 
 void PlatformAppBrowserTest::CloseAppWindow(AppWindow* window) {
   content::WebContentsDestroyedWatcher destroyed_watcher(
       window->web_contents());
   window->GetBaseWindow()->Close();
   destroyed_watcher.Wait();
@@ skipping 35 matching lines @@
   return app_window;
 }
 
 void ExperimentalPlatformAppBrowserTest::SetUpCommandLine(
     CommandLine* command_line) {
   PlatformAppBrowserTest::SetUpCommandLine(command_line);
   command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
 }
 
 }  // namespace extensions