Move AppWindow to extensions

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 "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/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/browser/app_window/app_window_registry.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/common/switches.h"
 
-using apps::AppWindow;
-using apps::AppWindowRegistry;
 using content::WebContents;
 
 namespace {
 
 const char kAppWindowTestApp[] = "app_window/generic";
 
 }  // namespace
 
 namespace utils = extension_function_test_utils;
 
@@ skipping 86 matching lines @@
   if (window)
     return window->web_contents();
 
   return NULL;
 }
 
 AppWindow* PlatformAppBrowserTest::GetFirstAppWindow() {
   return GetFirstAppWindowForBrowser(browser());
 }
 
-apps::AppWindow* PlatformAppBrowserTest::GetFirstAppWindowForApp(
+AppWindow* PlatformAppBrowserTest::GetFirstAppWindowForApp(
     const std::string& app_id) {
   AppWindowRegistry* app_registry =
       AppWindowRegistry::Get(browser()->profile());
   const AppWindowRegistry::AppWindowList& app_windows =
       app_registry->GetAppWindowsForApp(app_id);
 
   AppWindowRegistry::const_iterator iter = app_windows.begin();
   if (iter != app_windows.end())
     return *iter;
 
@@ skipping 80 matching lines @@
     const gfx::Rect& current_screen_bounds,
     const gfx::Size& minimum_size,
     gfx::Rect* bounds) {
   window->AdjustBoundsToBeVisibleOnScreen(cached_bounds,
                                           cached_screen_bounds,
                                           current_screen_bounds,
                                           minimum_size,
                                           bounds);
 }
 
-apps::AppWindow* PlatformAppBrowserTest::CreateTestAppWindow(
+AppWindow* PlatformAppBrowserTest::CreateTestAppWindow(
     const std::string& window_create_options) {
   ExtensionTestMessageListener launched_listener("launched", true);
   ExtensionTestMessageListener loaded_listener("window_loaded", false);
 
   // Load and launch the test app.
   const Extension* extension =
       LoadAndLaunchPlatformApp(kAppWindowTestApp, &launched_listener);
   EXPECT_TRUE(extension);
   EXPECT_TRUE(launched_listener.WaitUntilSatisfied());
 
   // Send the options for window creation.
   launched_listener.Reply(window_create_options);
 
   // Wait for the window to be opened and loaded.
   EXPECT_TRUE(loaded_listener.WaitUntilSatisfied());
 
   EXPECT_EQ(1U, GetAppWindowCount());
   AppWindow* app_window = GetFirstAppWindow();
   return app_window;
 }
 
 void ExperimentalPlatformAppBrowserTest::SetUpCommandLine(
     CommandLine* command_line) {
   PlatformAppBrowserTest::SetUpCommandLine(command_line);
   command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
 }
 
 }  // namespace extensions