Add switch to run ash tests on desktop in windows 8.

ash/test/test_suite.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 "ash/test/test_suite.h"
 
+#include "ash/ash_switches.h"
+#include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/compositor/compositor_setup.h"
 #include "ui/compositor/test/compositor_test_support.h"
 #include "ui/gfx/gfx_paths.h"
 
@@ skipping 12 matching lines @@
 namespace ash {
 namespace test {
 
 AuraShellTestSuite::AuraShellTestSuite(int argc, char** argv)
     : TestSuite(argc, argv) {}
 
 void AuraShellTestSuite::Initialize() {
   base::TestSuite::Initialize();
 
 #if defined(OS_WIN)
-  if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
+  if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
+      !CommandLine::ForCurrentProcess()->HasSwitch(
+          ash::switches::kForceAshToDesktop)) {
     ASSERT_TRUE(win8::RegisterTestDefaultBrowser(
         win8::test::kDefaultTestAppUserModelId,
         win8::test::kDefaultTestExeName));
 
     ui::win::CreateATLModuleIfNeeded();
 
     std::vector<string16> choices;
     win8::OpenWithDialogController controller;
     controller.RunSynchronously(NULL, L"http", win8::test::kDefaultTestExeName,
                                 &choices);
@@ skipping 15 matching lines @@
 }
 
 void AuraShellTestSuite::Shutdown() {
   ui::CompositorTestSupport::Terminate();
   ui::ResourceBundle::CleanupSharedInstance();
   base::TestSuite::Shutdown();
 }
 
 }  // namespace test
 }  // namespace ash