Fix native_viewport CommandLine; enable window_manager_apptests.

components/native_viewport/main.cc

 // Copyright 2014 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 <algorithm>
-
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "components/gles2/gpu_impl.h"
 #include "components/native_viewport/native_viewport_impl.h"
 #include "components/native_viewport/public/cpp/args.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/common/tracing_impl.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
 #include "third_party/mojo/src/mojo/public/cpp/application/application_connection.h"
@@ skipping 14 matching lines @@
                                   public mojo::InterfaceFactory<Gpu> {
  public:
   NativeViewportAppDelegate() : is_headless_(false) {}
   ~NativeViewportAppDelegate() override {}
 
  private:
   // mojo::ApplicationDelegate implementation.
   void Initialize(mojo::ApplicationImpl* application) override {
     tracing_.Initialize(application);
 
-#if defined(OS_LINUX)
-    // Apply the switch for kTouchEvents to CommandLine (if set). This allows
-    // redirecting the mouse to a touch device on X for testing.
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-    const std::string touch_event_string("--" +
-                                         std::string(switches::kTouchDevices));
-    auto touch_iter = std::find(application->args().begin(),
-                                application->args().end(),
-                                touch_event_string);
-    if (touch_iter != application->args().end() &&
-        ++touch_iter != application->args().end()) {
-      command_line->AppendSwitchASCII(touch_event_string, *touch_iter);
-    }
-#endif
-
-    if (application->HasArg(mojo::kUseTestConfig))
+    if (command_line->HasSwitch(mojo::kUseTestConfig))
       gfx::GLSurface::InitializeOneOffForTests();
     else
       gfx::GLSurface::InitializeOneOff();
 
-    is_headless_ = application->HasArg(mojo::kUseHeadlessConfig);
+    is_headless_ = command_line->HasSwitch(mojo::kUseHeadlessConfig);
   }
 
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
     connection->AddService<NativeViewport>(this);
     connection->AddService<Gpu>(this);
     return true;
   }
 
   // mojo::InterfaceFactory<NativeViewport> implementation.
   void Create(ApplicationConnection* connection,
@@ skipping 18 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(NativeViewportAppDelegate);
 };
 }
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(
       new native_viewport::NativeViewportAppDelegate);
   runner.set_message_loop_type(base::MessageLoop::TYPE_UI);
   return runner.Run(shell_handle);
 }