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 button_down_mask_ = 0;

[sadrul, 2017/04/28 14:27:18]

Just |button_down_mask| (or maybe |g_button_down_mask|)

[weidongg, 2017/04/28 16:52:18]

Done.

+
 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 {
@@ skipping 188 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