Rename apps::ShellWindow to apps::AppWindow

chrome/browser/apps/ephemeral_app_browsertest.cc

 // Copyright 2014 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 "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/common/extensions/api/alarms.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/test_utils.h"
@@ skipping 60 matching lines @@
       return NULL;
 
     return extension;
   }
 
   void CloseApp(const std::string& app_id) {
     content::WindowedNotificationObserver event_page_destroyed_signal(
         chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED,
         content::Source<Profile>(browser()->profile()));
 
-    EXPECT_EQ(1U, GetShellWindowCountForApp(app_id));
-    apps::ShellWindow* shell_window = GetFirstShellWindowForApp(app_id);
-    ASSERT_TRUE(shell_window);
-    CloseShellWindow(shell_window);
+    EXPECT_EQ(1U, GetAppWindowCountForApp(app_id));
+    apps::AppWindow* app_window = GetFirstAppWindowForApp(app_id);
+    ASSERT_TRUE(app_window);
+    CloseAppWindow(app_window);
 
     event_page_destroyed_signal.Wait();
   }
 
   void VerifyAppNotLoaded(const std::string& app_id) {
     EXPECT_FALSE(ExtensionSystem::Get(browser()->profile())->
         process_manager()->GetBackgroundHostForExtension(app_id));
   }
 
   void DispatchAlarmEvent(EventRouter* event_router,
@@ skipping 98 matching lines @@
       ExtensionSystem::Get(browser()->profile())->extension_service();
   EXPECT_TRUE(service->UpdateExtension(app_id, app_v2_path, true, GURL(),
                                        &crx_installer));
   windowed_observer.Wait();
 
   const Extension* app_v2 = service->GetExtensionById(app_id, false);
   ASSERT_TRUE(app_v2);
   EXPECT_TRUE(app_v2->version()->CompareTo(app_original_version) > 0);
   EXPECT_TRUE(app_v2->is_ephemeral());
 }