Deprecate Browser::TYPE_PANEL

chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc

Index: chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc
index 9ca03c1f438f3d238c54e9e70faf76f5960a8f1a..7b9a9087431128894e73146b0f923d460978ba79 100644
--- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc
@@ -24,8 +24,10 @@
 #include "net/test/test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-// TODO(skuhne): Remove this module together with launcher_favicon_loader.*
-// when the old launcher goes away.
+// TODO(stevenjb): Replace this using AshPanelContents (the current tests were
+// writen using Browser Panels which no longer exist).
+
+#if 0
 
 namespace {
 
@@ -60,7 +62,7 @@ class ContentsObserver : public content::WebContentsObserver {
 class LauncherFaviconLoaderBrowsertest : public InProcessBrowserTest {
  public:
   LauncherFaviconLoaderBrowsertest()
-    : panel_browser_(NULL),
+    : browser_(NULL),
       loader_(NULL),
       contents_observer_(NULL) {
   }
@@ -75,30 +77,30 @@ class LauncherFaviconLoaderBrowsertest : public InProcessBrowserTest {
 
  protected:
   void NavigateTo(const char* url) {
-    Browser* browser = GetPanelBrowser();
+    Browser* browser = GetBrowser();
     std::string url_path = base::StringPrintf("files/ash/launcher/%s", url);
     ui_test_utils::NavigateToURL(browser, test_server()->GetURL(url_path));
   }
 
-  Browser* GetPanelBrowser() {
-    if (!panel_browser_) {
-      panel_browser_ = new Browser(Browser::CreateParams::CreateForApp(
-          Browser::TYPE_PANEL, "Test Panel", gfx::Rect(),
+  Browser* GetBrowser() {
+    if (!browser_) {
+      browser_ = new Browser(Browser::CreateParams::CreateForApp(
+          Browser::TYPE_POPUP, "Test Popup", gfx::Rect(),
           browser()->profile(), browser()->host_desktop_type()));
-      EXPECT_TRUE(panel_browser_->is_type_panel());
+      EXPECT_TRUE(browser_->is_type_popup());
       // Load initial web contents before setting the observer.
-      ui_test_utils::NavigateToURL(panel_browser_, GURL());
+      ui_test_utils::NavigateToURL(browser_, GURL());
       EXPECT_FALSE(contents_observer_.get());
       contents_observer_.reset(
           new ContentsObserver(
-              panel_browser_->tab_strip_model()->GetWebContentsAt(0)));
+              browser_->tab_strip_model()->GetWebContentsAt(0)));
     }
-    return panel_browser_;
+    return browser_;
   }
 
   LauncherFaviconLoader* GetFaviconLoader() {
     if (!loader_) {
-      Browser* browser = GetPanelBrowser();
+      Browser* browser = GetBrowser();
       BrowserView* browser_view = static_cast<BrowserView*>(browser->window());
       BrowserLauncherItemController* launcher_item_controller =
           browser_view->launcher_item_controller();
@@ -198,3 +200,5 @@ IN_PROC_BROWSER_TEST_F(LauncherFaviconLoaderBrowsertest, ChangeLauncherIcons) {
   EXPECT_FALSE(favicon_loader->GetFavicon().empty());
   EXPECT_EQ(128, favicon_loader->GetFavicon().height());
 }
+
+#endif