Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / apps / native_app_window_cocoa_browsertest.mm

diff --git a/src/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm b/src/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm
index 13afc2e..1976806 100644 (file)
--- a/src/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm
+++ b/src/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm
@@ -6,10 +6,10 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "apps/shell_window_registry.h"
+#include "apps/app_window_registry.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
-#include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/extensions/application_launch.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 
@@ -30,8 +30,11 @@ class NativeAppWindowCocoaBrowserTest : public PlatformAppBrowserTest {
       content::WindowedNotificationObserver app_loaded_observer(
           content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
           content::NotificationService::AllSources());
-      OpenApplication(AppLaunchParams(
-          profile(), app_, extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW));
+      OpenApplication(
+          AppLaunchParams(profile(),
+                          app_,
+                          extensions::LAUNCH_CONTAINER_NONE,
+                          NEW_WINDOW));
       app_loaded_observer.Wait();
     }
   }
@@ -47,8 +50,8 @@ class NativeAppWindowCocoaBrowserTest : public PlatformAppBrowserTest {
 // Test interaction of Hide/Show() with Hide/ShowWithApp().
 IN_PROC_BROWSER_TEST_F(NativeAppWindowCocoaBrowserTest, HideShowWithApp) {
   SetUpAppWithWindows(2);
-  apps::ShellWindowRegistry::ShellWindowList windows =
-      apps::ShellWindowRegistry::Get(profile())->shell_windows();
+  apps::AppWindowRegistry::AppWindowList windows =
+      apps::AppWindowRegistry::Get(profile())->app_windows();
   apps::NativeAppWindow* window = windows.front()->GetBaseWindow();
   NSWindow* ns_window = window->GetNativeWindow();
   apps::NativeAppWindow* other_window = windows.back()->GetBaseWindow();