Add tests for panel app icon functionaility.

chrome/browser/ui/panels/base_panel_browser_test.cc

Index: chrome/browser/ui/panels/base_panel_browser_test.cc
diff --git a/chrome/browser/ui/panels/base_panel_browser_test.cc b/chrome/browser/ui/panels/base_panel_browser_test.cc
index c39c8b2be26eebf7329446a109ae71aa598d1275..a4bd6a67616698c5734e76f6330c02493c5c0f79 100644
--- a/chrome/browser/ui/panels/base_panel_browser_test.cc
+++ b/chrome/browser/ui/panels/base_panel_browser_test.cc
@@ -6,6 +6,7 @@
 
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "base/json/json_file_value_serializer.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ -262,6 +263,16 @@ void BasePanelBrowserTest::WaitForWindowSizeAvailable(Panel* panel) {
   EXPECT_TRUE(panel_testing->IsWindowSizeKnown());
 }
 
+void BasePanelBrowserTest::WaitForAppIconAvailable(Panel* panel) {
+  content::WindowedNotificationObserver signal(
+      chrome::NOTIFICATION_PANEL_ICON_KNOWN,
+      content::Source<Panel>(panel));
+  if (!panel->app_icon().IsEmpty())
+    return;
+  signal.Wait();
+  EXPECT_FALSE(panel->app_icon().IsEmpty());
+}
+
 void BasePanelBrowserTest::WaitForBoundsAnimationFinished(Panel* panel) {
   scoped_ptr<NativePanelTesting> panel_testing(
       CreateNativePanelTesting(panel));
@@ -424,6 +435,32 @@ scoped_refptr<Extension> BasePanelBrowserTest::CreateExtension(
   return extension;
 }
 
+scoped_refptr<extensions::Extension>
+BasePanelBrowserTest::LoadExtensionFromManifest(

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

This logic makes assumptions about extension implementation details, like the
manifest file being json, that may change and violates abstractions. Even the
ExtensionBrowserTest extension loading code does not get into this level of
detail.  Can you do something more like
ExtensionBrowserTest::LoadExtensionWithFlags? If you must copy code, at least
make it look like the other usages. 

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

Moved it out to the new file and changed it to use LoadExtension.

+    const FilePath::StringType& manifest_file) {
+  FilePath manifest_path;
+  PathService::Get(chrome::DIR_TEST_DATA, &manifest_path);
+  manifest_path = manifest_path.Append(kTestDir);
+  manifest_path = manifest_path.Append(manifest_file);
+
+  JSONFileValueSerializer serializer(manifest_path);
+  scoped_ptr<DictionaryValue> manifest(
+      static_cast<DictionaryValue*>(serializer.Deserialize(NULL, NULL)));
+  EXPECT_TRUE(manifest.get() != NULL);
+
+  std::string error;
+  scoped_refptr<extensions::Extension> extension(Extension::Create(
+      manifest_path.DirName(), Extension::INVALID, *manifest.get(),
+      Extension::NO_FLAGS, &error));
+  EXPECT_TRUE(extension.get());
+  EXPECT_STREQ("", error.c_str());
+  browser()->profile()->GetExtensionService()->
+      OnExtensionInstalled(extension.get(), false /* not from webstore */,
+                           syncer::StringOrdinal(),
+                           false /* no requirement errors */);
+  return extension;
+}
+
 void BasePanelBrowserTest::SetTestingAreas(const gfx::Rect& primary_screen_area,
                                            const gfx::Rect& work_area) {
   DCHECK(primary_screen_area.Contains(work_area));