aura: Fix BrowserInitTest.OpenAppShortcutPanel.

chrome/browser/ui/browser_init_browsertest.cc

 // Copyright (c) 2011 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 "base/command_line.h"
 #include "base/file_path.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/first_run/first_run.h"
@@ skipping 271 matching lines @@
   BrowserInit::IsFirstRun first_run = FirstRun::IsChromeFirstRun() ?
       BrowserInit::IS_FIRST_RUN : BrowserInit::IS_NOT_FIRST_RUN;
   BrowserInit::LaunchWithProfile launch(FilePath(), command_line, first_run);
   ASSERT_TRUE(launch.Launch(browser()->profile(), std::vector<GURL>(), false));
 
   // The launch should have created a new browser, with a panel type.
   Browser* new_browser = NULL;
   ASSERT_NO_FATAL_FAILURE(FindOneOtherBrowser(&new_browser));
 
   // Expect an app panel.
+#if defined(USE_AURA)
+  // In aura, apps open in popup windows.
+  EXPECT_TRUE(new_browser->is_type_popup() && new_browser->is_app());
+#else
   EXPECT_TRUE(new_browser->is_type_panel() && new_browser->is_app());
+#endif
 
   // The new browser's app_name should include the app's ID.
   EXPECT_NE(
       new_browser->app_name_.find(extension_app->id()),
       std::string::npos) << new_browser->app_name_;
 }
 
 #endif  // !defined(OS_MACOSX)