Add tests for panel app icon functionaility.

chrome/browser/ui/panels/panel_browsertest.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/prefs/browser_prefs.h"
@@ skipping 1671 matching lines @@
   ::MSG key_msg = { NULL, WM_KEYDOWN, ui::VKEY_W, 0 };
   content::NativeWebKeyboardEvent key_event(key_msg);
   key_event.modifiers = content::NativeWebKeyboardEvent::ControlKey;
 #else
   content::NativeWebKeyboardEvent key_event;
 #endif
   panel->HandleKeyboardEvent(key_event);
   signal.Wait();
   EXPECT_EQ(0, panel_manager->num_panels());
 }
+
+IN_PROC_BROWSER_TEST_F(PanelBrowserTest, PanelAppIcon) {

[jennb, 2012/10/02 17:51:08]

Neither of these two tests rely on BasePanelBrowserTest. You could create a new
test type:

PanelExtensionBrowserTest : public ExtensionBrowserTest

and put these 2 tests there. Use PanelManager::Create() to create the panel for
the tests instead of CreatePanelWithParams. That allows these 2 tests to run as
browser_tests instead of interactive_ui_tests, which should be reserved for
tests that cannot be run in parallel.

[jianli, 2012/10/02 21:37:26]

Done.

+  // Create a test extension from the manifest with icons provided.
+  scoped_refptr<extensions::Extension> extension = LoadExtensionFromManifest(
+      FILE_PATH_LITERAL("test_extension/manifest.json"));
+  std::string extension_app_name =
+      web_app::GenerateApplicationNameFromExtensionId(extension->id());
+
+  // Create a panel with the extension as host.
+  CreatePanelParams params(extension_app_name, gfx::Rect(), SHOW_AS_INACTIVE);
+  Panel* panel = CreatePanelWithParams(params);
+  WaitForAppIconAvailable(panel);
+  scoped_ptr<NativePanelTesting> native_panel_testing(
+      CreateNativePanelTesting(panel));
+
+  // First verify on the panel level.
+  gfx::ImageSkia app_icon = panel->app_icon().AsImageSkia();
+  EXPECT_EQ(32, app_icon.width());
+  EXPECT_EQ(32, app_icon.height());
+
+  // Then verify on the native panel level.
+  EXPECT_TRUE(native_panel_testing->VerifyAppIcon());
+
+  panel->Close();
+}
+
+// Tests that icon loading might not be completed when the panel is closed.
+// (crbug.com/151484)
+IN_PROC_BROWSER_TEST_F(PanelBrowserTest, ClosePanelBeforeIconLoadingCompleted) {
+  // Create a test extension from the manifest with icons provided.
+  scoped_refptr<Extension> extension = LoadExtensionFromManifest(
+      FILE_PATH_LITERAL("test_extension/manifest.json"));
+  std::string extension_app_name =
+      web_app::GenerateApplicationNameFromExtensionId(extension->id());
+
+  // Create a panel with the extension as host.
+  CreatePanelParams params(extension_app_name, gfx::Rect(), SHOW_AS_INACTIVE);
+  // Do not wait because we want to close the panel before the callback to
+  // signal the icon loading completion is executed.
+  params.wait_for_fully_created = false;
+  Panel* panel = CreatePanelWithParams(params);
+
+  panel->Close();
+}
+