Revert 182281 - Broke Chome Frame tests.

chrome/browser/ui/views/frame/browser_desktop_root_window_host_win.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/views/frame/browser_desktop_root_window_host_win.h"
 
 #include <dwmapi.h>
 
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
-#include "chrome/browser/ui/views/frame/browser_frame_common_win.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/theme_image_mapper.h"
 #include "grit/theme_resources.h"
 #include "ui/base/theme_provider.h"
 #include "ui/views/controls/menu/native_menu_win.h"
-#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 #pragma comment(lib, "dwmapi.lib")
 
 namespace {
 
 const int kClientEdgeThickness = 3;
 // We need to offset the DWMFrame into the toolbar so that the blackness
 // doesn't show up on our rounded corners.
 const int kDWMFrameTopOffset = 3;
 
@@ skipping 187 matching lines @@
   if (!browser_view_->IsBrowserTypeNormal() &&
       !DesktopRootWindowHostWin::IsUsingCustomFrame()) {
     return false;
   }
 
   // Otherwise, we use the native frame when we're told we should by the theme
   // provider (e.g. no custom theme is active).
   return !GetWidget()->GetThemeProvider()->ShouldUseNativeFrame();
 }
 
-bool BrowserDesktopRootWindowHostWin::ShouldUseNativeFrame() {
-  return chrome::ShouldUseNativeFrame(desktop_native_widget_aura(),
-                                      browser_view_,
-                                      GetWidget()->GetThemeProvider());
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserDesktopRootWindowHostWin, private:
 
 void BrowserDesktopRootWindowHostWin::UpdateDWMFrame() {
   // For "normal" windows on Aero, we always need to reset the glass area
   // correctly, even if we're not currently showing the native frame (e.g.
   // because a theme is showing), so we explicitly check for that case rather
   // than checking browser_frame_->ShouldUseNativeFrame() here.  Using that here
   // would mean we wouldn't reset the glass area to zero when moving from the
   // native frame to an opaque frame, leading to graphical glitches behind the
@@ skipping 39 matching lines @@
         views::DesktopNativeWidgetAura* desktop_native_widget_aura,
         const gfx::Rect& initial_bounds,
         BrowserView* browser_view,
         BrowserFrame* browser_frame) {
   return new BrowserDesktopRootWindowHostWin(native_widget_delegate,
                                              desktop_native_widget_aura,
                                              initial_bounds,
                                              browser_view,
                                              browser_frame);
 }