mash: Don't synthesize extra key press events in the window server

ui/ozone/public/ozone_platform.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 "base/command_line.h"
+#include "ui/ozone/public/ozone_platform.h"
+
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/ozone/platform_object.h"
 #include "ui/ozone/platform_selection.h"
-#include "ui/ozone/public/ozone_platform.h"
-#include "ui/ozone/public/ozone_switches.h"
 
 namespace ui {
 
 namespace {
 
 bool g_platform_initialized_ui = false;
 bool g_platform_initialized_gpu = false;
 
-}
+}  // namespace
 
 OzonePlatform::OzonePlatform() {
   DCHECK(!instance_) << "There should only be a single OzonePlatform.";
   instance_ = this;
   g_platform_initialized_ui = false;
   g_platform_initialized_gpu = false;
 }
 
 OzonePlatform::~OzonePlatform() {
   DCHECK_EQ(instance_, this);
@@ skipping 21 matching lines @@
 // static
 void OzonePlatform::InitializeForGPU(const InitParams& args) {
   EnsureInstance();
   if (g_platform_initialized_gpu)
     return;
   g_platform_initialized_gpu = true;
   instance_->InitializeGPU(args);
 }
 
 // static
+void OzonePlatform::Shutdown() {
+  delete instance_;
+  // Destructor resets pointer.
+}
+
+// static
 OzonePlatform* OzonePlatform::GetInstance() {
   DCHECK(instance_) << "OzonePlatform is not initialized";
   return instance_;
 }
 
 // static
 OzonePlatform* OzonePlatform::EnsureInstance() {
   if (!instance_) {
     TRACE_EVENT1("ozone",
                  "OzonePlatform::Initialize",
                  "platform",
                  GetOzonePlatformName());
     std::unique_ptr<OzonePlatform> platform =
         PlatformObject<OzonePlatform>::Create();
 
     // TODO(spang): Currently need to leak this object.
     OzonePlatform* pl = platform.release();
     DCHECK_EQ(instance_, pl);
   }
   return instance_;
 }
 
 // static
-OzonePlatform* OzonePlatform::instance_;
+OzonePlatform* OzonePlatform::instance_ = nullptr;
 
 IPC::MessageFilter* OzonePlatform::GetGpuMessageFilter() {
   return nullptr;
 }
 
 base::MessageLoop::Type OzonePlatform::GetMessageLoopTypeForGpu() {
   return base::MessageLoop::TYPE_DEFAULT;
 }
 
 void OzonePlatform::AddInterfaces(
     service_manager::InterfaceRegistry* registry) {}
 
 }  // namespace ui