Add tests for panel app icon functionaility.

chrome/browser/ui/panels/base_panel_browser_test.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 "chrome/browser/ui/panels/base_panel_browser_test.h"
 
 #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"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/panels/native_panel.h"
 #include "chrome/browser/ui/panels/panel_mouse_watcher.h"
 #include "chrome/browser/ui/panels/panel_strip.h"
@@ skipping 236 matching lines @@
       CreateNativePanelTesting(panel));
   content::WindowedNotificationObserver signal(
       chrome::NOTIFICATION_PANEL_WINDOW_SIZE_KNOWN,
       content::Source<Panel>(panel));
   if (panel_testing->IsWindowSizeKnown())
     return;
   signal.Wait();
   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));
   // Sometimes there are several animations in sequence due to content
   // auto resizing. Wait for all animations to finish.
   while (panel_testing->IsAnimatingBounds()) {
     content::WindowedNotificationObserver signal(
         chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
         content::Source<Panel>(panel));
     if (!panel_testing->IsAnimatingBounds())
@@ skipping 142 matching lines @@
       full_path,  location, *input_value, 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;
 }
 
+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));
   mock_display_settings_provider_->SetPrimaryScreenArea(primary_screen_area);
   mock_display_settings_provider_->SetWorkArea(
       work_area.IsEmpty() ? primary_screen_area : work_area);
 }
 
 void BasePanelBrowserTest::CloseWindowAndWait(Panel* panel) {
   // Closing a panel may involve several async tasks. Need to use
@@ skipping 31 matching lines @@
 }
 
 void BasePanelBrowserTest::MoveMouse(const gfx::Point& position) {
   PanelManager::GetInstance()->mouse_watcher()->NotifyMouseMovement(position);
 }
 
 std::string BasePanelBrowserTest::MakePanelName(int index) {
   std::string panel_name("Panel");
   return panel_name + base::IntToString(index);
 }