Remove a bunch of dead files after the win aura switch.

chrome/browser/ui/views/frame/browser_view_unittest.cc

 // Copyright 2013 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/views/frame/browser_view.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
 #include "chrome/browser/ui/views/frame/test_with_browser_view.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/url_constants.h"
+#include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/single_split_view.h"
 #include "ui/views/controls/webview/webview.h"
 
-#if defined(OS_WIN)
-#include "chrome/browser/ui/views/frame/browser_frame_win.h"
-#endif
-
 namespace {
 
 // Tab strip bounds depend on the window frame sizes.
 gfx::Point ExpectedTabStripOrigin(BrowserView* browser_view) {
   gfx::Rect tabstrip_bounds(
       browser_view->frame()->GetBoundsForTabStrip(browser_view->tabstrip()));
   gfx::Point tabstrip_origin(tabstrip_bounds.origin());
   views::View::ConvertPointToTarget(browser_view->parent(),
                                     browser_view,
                                     &tabstrip_origin);
@@ skipping 124 matching lines @@
   EXPECT_FALSE(bookmark_bar->visible());
   EXPECT_FALSE(bookmark_bar->IsDetached());
   EXPECT_EQ(top_container, bookmark_bar->parent());
   // Top container is still second from front.
   EXPECT_EQ(browser_view()->child_count() - 2,
             browser_view()->GetIndexOf(top_container));
 
   BookmarkBarView::DisableAnimationsForTesting(false);
 }
 
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(OS_WIN)
 
 // This class provides functionality to test the incognito window/normal window
 // switcher button which is added to Windows 8 metro Chrome.
 // We create the BrowserView ourselves in the
 // BrowserWithTestWindowTest::CreateBrowserWindow function override and add the
 // switcher button to the view. We also provide an incognito profile to ensure
 // that the switcher button is visible.
 class BrowserViewIncognitoSwitcherTest : public TestWithBrowserView {
  public:
   // Subclass of BrowserView, which overrides the GetRestoreBounds/IsMaximized
@@ skipping 36 matching lines @@
   virtual BrowserWindow* CreateBrowserWindow() OVERRIDE {
     // We need an incognito profile for the window switcher button to be
     // visible.
     // This profile instance is owned by the TestingProfile instance within the
     // BrowserWithTestWindowTest class.
     TestingProfile::Builder builder;
     builder.SetIncognito();
     GetProfile()->SetOffTheRecordProfile(builder.Build());
 
     browser_view_ = new TestBrowserView();
-    browser_view_->SetWindowSwitcherButton(
-        MakeWindowSwitcherButton(NULL, false));
+
+    views::ImageButton* switcher_button = new views::ImageButton(NULL);
+    // The button in the incognito window has the hot-cold images inverted
+    // with respect to the regular browser window.
+    switcher_button->SetImage(
+        views::ImageButton::STATE_NORMAL,
+        ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+            IDR_INCOGNITO_SWITCH_OFF));
+    switcher_button->SetImage(
+        views::ImageButton::STATE_HOVERED,
+        ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+            IDR_INCOGNITO_SWITCH_ON));
+    switcher_button->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
+                                        views::ImageButton::ALIGN_MIDDLE);
+
+    browser_view_->SetWindowSwitcherButton(switcher_button);
     return browser_view_;
   }
 
  private:
   BrowserView* browser_view_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserViewIncognitoSwitcherTest);
 };
 
 // Test whether the windows incognito/normal browser window switcher button
 // is the event handler for a point within its bounds. The event handler for
 // a point in the View class is dependent on the order in which children are
 // added to it. This test ensures that we don't regress in the window switcher
 // functionality when additional children are added to the BrowserView class.
 TEST_F(BrowserViewIncognitoSwitcherTest,
        BrowserViewIncognitoSwitcherEventHandlerTest) {
   // |browser_view_| owns the Browser, not the test class.
-  EXPECT_FALSE(browser());
   EXPECT_TRUE(browser_view()->browser());
   // Test initial state.
   EXPECT_TRUE(browser_view()->IsTabStripVisible());
   // Validate whether the window switcher button is the target for the position
   // passed in.
   gfx::Point switcher_point(browser_view()->window_switcher_button()->x() + 2,
                             browser_view()->window_switcher_button()->y());
   EXPECT_EQ(browser_view()->GetEventHandlerForPoint(switcher_point),
             browser_view()->window_switcher_button());
 }
 #endif