Deprecate Browser::TYPE_PANEL

chrome/browser/ui/ash/launcher/launcher_favicon_loader_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 <vector>
 
 #include "ash/ash_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/favicon_url.h"
 #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 {
 
 // Observer class to determine when favicons have completed loading.
 class ContentsObserver : public content::WebContentsObserver {
  public:
   explicit ContentsObserver(content::WebContents* web_contents)
       : content::WebContentsObserver(web_contents),
         got_favicons_(false) {
   }
@@ skipping 14 matching lines @@
 
  private:
   bool got_favicons_;
 };
 
 }  // namespace
 
 class LauncherFaviconLoaderBrowsertest : public InProcessBrowserTest {
  public:
   LauncherFaviconLoaderBrowsertest()
-    : panel_browser_(NULL),
+    : browser_(NULL),
       loader_(NULL),
       contents_observer_(NULL) {
   }
 
   virtual ~LauncherFaviconLoaderBrowsertest() {
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     InProcessBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(ash::switches::kAshDisablePerAppLauncher);
   }
 
  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();
       if (!launcher_item_controller)
         return NULL;
       EXPECT_EQ(BrowserLauncherItemController::TYPE_EXTENSION_PANEL,
                 launcher_item_controller->type());
       loader_ = launcher_item_controller->favicon_loader();
     }
     return loader_;
@@ skipping 79 matching lines @@
   NavigateTo("launcher-smallfavicon.html");
   EXPECT_TRUE(WaitForFaviconDownloads());
   EXPECT_TRUE(favicon_loader->GetFavicon().empty());
   ASSERT_NO_FATAL_FAILURE(ResetDownloads());
 
   NavigateTo("launcher-largefavicon.html");
   EXPECT_TRUE(WaitForFaviconDownloads());
   EXPECT_FALSE(favicon_loader->GetFavicon().empty());
   EXPECT_EQ(128, favicon_loader->GetFavicon().height());
 }
+
+#endif