Revert of Fix an interactive ui test

ui/aura/test/ui_controls_factory_ozone.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/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/aura_test_utils.h"
 #include "ui/aura/test/ui_controls_factory_aura.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/test/ui_controls_aura.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/events_test_utils.h"
 
 namespace aura {
 namespace test {
 namespace {
 
-// Mask of the mouse buttons currently down.
-unsigned g_button_down_mask = 0;
-
 class UIControlsOzone : public ui_controls::UIControlsAura {
  public:
   UIControlsOzone(WindowTreeHost* host) : host_(host) {}
 
   bool SendKeyPress(gfx::NativeWindow window,
                     ui::KeyboardCode key,
                     bool control,
                     bool shift,
                     bool alt,
                     bool command) override {
     return SendKeyPressNotifyWhenDone(
         window, key, control, shift, alt, command, base::Closure());
   }
   bool SendKeyPressNotifyWhenDone(
       gfx::NativeWindow window,
       ui::KeyboardCode key,
       bool control,
       bool shift,
       bool alt,
       bool command,
       const base::Closure& closure) override {
-    int flags = g_button_down_mask;
+    int flags = button_down_mask_;
 
     if (control) {
       flags |= ui::EF_CONTROL_DOWN;
       PostKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, flags);
     }
 
     if (shift) {
       flags |= ui::EF_SHIFT_DOWN;
       PostKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_SHIFT, flags);
     }
@@ skipping 48 matching lines @@
     if (screen_position_client) {
       screen_position_client->ConvertPointFromScreen(host_->window(),
                                                      &root_location);
     }
 
     gfx::Point host_location = root_location;
     host_->ConvertDIPToPixels(&host_location);
 
     ui::EventType event_type;
 
-    if (g_button_down_mask)
+    if (button_down_mask_)
       event_type = ui::ET_MOUSE_DRAGGED;
     else
       event_type = ui::ET_MOUSE_MOVED;
 
-    PostMouseEvent(event_type, host_location, g_button_down_mask, 0);
+    PostMouseEvent(event_type, host_location, button_down_mask_, 0);
 
     RunClosureAfterAllPendingUIEvents(closure);
     return true;
   }
   bool SendMouseEvents(ui_controls::MouseButton type, int state) override {
     return SendMouseEventsNotifyWhenDone(type, state, base::Closure());
   }
   bool SendMouseEventsNotifyWhenDone(
       ui_controls::MouseButton type,
       int state,
@@ skipping 20 matching lines @@
         break;
       case ui_controls::RIGHT:
         flag = ui::EF_RIGHT_MOUSE_BUTTON;
         break;
       default:
         NOTREACHED();
         break;
     }
 
     if (state & ui_controls::DOWN) {
-      g_button_down_mask |= flag;
+      button_down_mask_ |= flag;
       PostMouseEvent(ui::ET_MOUSE_PRESSED, host_location,
-                     g_button_down_mask | flag, flag);
+                     button_down_mask_ | flag, flag);
     }
     if (state & ui_controls::UP) {
-      g_button_down_mask &= ~flag;
+      button_down_mask_ &= ~flag;
       PostMouseEvent(ui::ET_MOUSE_RELEASED, host_location,
-                     g_button_down_mask | flag, flag);
+                     button_down_mask_ | flag, flag);
     }
 
     RunClosureAfterAllPendingUIEvents(closure);
     return true;
   }
   bool SendMouseClick(ui_controls::MouseButton type) override {
     return SendMouseEvents(type, ui_controls::UP | ui_controls::DOWN);
   }
   void RunClosureAfterAllPendingUIEvents(
       const base::Closure& closure) override {
@@ skipping 44 matching lines @@
                                changed_button_flags);
 
     // This hack is necessary to set the repeat count for clicks.
     ui::MouseEvent mouse_event2(&mouse_event);
 
     SendEventToSink(&mouse_event2);
   }
 
   WindowTreeHost* host_;
 
+  // Mask of the mouse buttons currently down.
+  unsigned button_down_mask_ = 0;
+
   DISALLOW_COPY_AND_ASSIGN(UIControlsOzone);
 };
 
 }  // namespace
 
 ui_controls::UIControlsAura* CreateUIControlsAura(WindowTreeHost* host) {
   return new UIControlsOzone(host);
 }
 
 }  // namespace test
 }  // namespace aura