Decouple IsMetroProcess() calls, introducing IsSingleWindowMetroMode().

chrome/browser/extensions/api/tabs/tabs.cc

Index: chrome/browser/extensions/api/tabs/tabs.cc
diff --git a/chrome/browser/extensions/api/tabs/tabs.cc b/chrome/browser/extensions/api/tabs/tabs.cc
index 3b92c40d88a7e4064c0ee1f98ab691518398e886..d338bffc453a05dc5ad0c1f9f0aa12cfdd1310f5 100644
--- a/chrome/browser/extensions/api/tabs/tabs.cc
+++ b/chrome/browser/extensions/api/tabs/tabs.cc
@@ -77,7 +77,7 @@
 #include "ui/gfx/codec/png_codec.h"
 
 #if defined(OS_WIN)
-#include "base/win/metro.h"
+#include "win8/util/win8_util.h"
 #endif  // OS_WIN
 
 namespace Get = extensions::api::windows::Get;
@@ -229,7 +229,7 @@ Browser* CreateBrowserWindow(const Browser::CreateParams& params,
 
 #if defined(OS_WIN)
   // In windows 8 metro mode we don't allow windows to be created.
-  if (base::win::IsMetroProcess())
+  if (win8::IsSingleWindowMetroMode())
     use_existing_browser_window = true;
 #endif  // OS_WIN
 
@@ -669,7 +669,7 @@ bool UpdateWindowFunction::RunImpl() {
 
 #if defined(OS_WIN)
   // Silently ignore changes on the window for metro mode.
-  if (base::win::IsMetroProcess()) {
+  if (win8::IsSingleWindowMetroMode()) {
     SetResult(controller->CreateWindowValue());
     return true;
   }
@@ -809,10 +809,10 @@ bool RemoveWindowFunction::RunImpl() {
   if (!GetWindowFromWindowID(this, window_id, &controller))
     return false;
 
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(OS_WIN)
   // In Windows 8 metro mode, an existing Browser instance is reused for
   // hosting the extension tab. We should not be closing it as we don't own it.
-  if (base::win::IsMetroProcess())
+  if (win8::IsSingleWindowMetroMode())
     return false;
 #endif