Decouple IsMetroProcess() calls, introducing IsSingleWindowMetroMode().

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

Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
index ea37da02b200e463ddea4ef2439c226440b44131..a05c927c9b960ddbe3359d4c41fff55fb5ae2243 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -45,7 +45,7 @@
 #include "ui/views/window/window_shape.h"
 
 #if defined(OS_WIN)
-#include "base/win/metro.h"
+#include "win8/util/win8_util.h"
 #endif  // OS_WIN
 
 using content::WebContents;
@@ -118,8 +118,8 @@ bool ConvertedContainsCheck(gfx::Rect bounds, const views::View* src,
 }
 
 bool ShouldAddDefaultCaptionButtons() {
-#if defined(OS_WIN) && !defined(USE_AURA)
-  return !base::win::IsMetroProcess();
+#if defined(OS_WIN)
+  return !win8::IsSingleWindowMetroMode();
 #endif  // OS_WIN
   return true;
 }