Work on separate browser contexts

ui/views/test/test_views_delegate.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 "ui/views/test/test_views_delegate.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "content/public/test/web_contents_tester.h"
-#include "ui/views/views_switches.h"
 
 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#include "ui/gfx/screen.h"
 #include "ui/views/widget/desktop_native_widget_aura.h"
 #endif
 
 namespace views {
 
 TestViewsDelegate::TestViewsDelegate()
     : use_transparent_windows_(false) {
   DCHECK(!ViewsDelegate::views_delegate);
   ViewsDelegate::views_delegate = this;
 }
@@ skipping 42 matching lines @@
 content::WebContents* TestViewsDelegate::CreateWebContents(
     content::BrowserContext* browser_context,
     content::SiteInstance* site_instance) {
   return NULL;
 }
 
 NativeWidget* TestViewsDelegate::CreateNativeWidget(
     Widget::InitParams::Type type,
     internal::NativeWidgetDelegate* delegate,
     gfx::NativeView parent) {
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDesktopAura))
-    return new DesktopNativeWidgetAura(delegate);
-#endif
   return NULL;
 }
 
 }  // namespace views