Cleanup Ash Metro mode.

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/common/ash_switches.h"
 #include "ash/test/ash_test_environment.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 19 matching lines @@
     : TestSuite(argc, argv) {}
 
 AuraShellTestSuite::~AuraShellTestSuite() {}
 
 void AuraShellTestSuite::Initialize() {
   base::TestSuite::Initialize();
   gl::GLSurfaceTestSupport::InitializeOneOff();
 
 #if defined(OS_WIN)
   base::win::Version version = base::win::GetVersion();
   // Although Ash officially is only supported for users on Win7+, we still run

[sky, 2016/09/08 23:45:36]

Nuke this comment and always create com_initializer_ as vista is the minimum
now.

[rjkroege, 2016/09/09 00:04:21]

Done.

   // ash_unittests on Vista builders, so we still need to initialize COM.
-  if (version >= base::win::VERSION_VISTA &&
-      !base::CommandLine::ForCurrentProcess()->HasSwitch(
-          ash::switches::kForceAshToDesktop)) {
+  if (version >= base::win::VERSION_VISTA) {
     com_initializer_.reset(new base::win::ScopedCOMInitializer());
     ui::win::CreateATLModuleIfNeeded();
   }
 #endif
 
   gfx::RegisterPathProvider();
   ui::RegisterPathProvider();
 
   // Force unittests to run using en-US so if we test against string output,
   // it'll pass regardless of the system language.
@@ skipping 27 matching lines @@
   env_.reset();
   ui::ResourceBundle::CleanupSharedInstance();
 #if defined(OS_WIN)
   com_initializer_.reset();
 #endif
   base::TestSuite::Shutdown();
 }
 
 }  // namespace test
 }  // namespace ash