Revert of mash: Close system tray bubble on click outside its bounds, part 1

ui/views/widget/widget_interactive_uitest.cc

 // Copyright (c) 2013 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 <stddef.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/path_service.h"
@@ skipping 65 matching lines @@
       event->StopPropagation();
     }
   }
 
   DISALLOW_COPY_AND_ASSIGN(GestureCaptureView);
 };
 
 // A view that always processes all mouse events.
 class MouseView : public View {
  public:
-  MouseView() {}
+  MouseView()
+      : View(),
+        entered_(0),
+        exited_(0),
+        pressed_(0) {
+  }
   ~MouseView() override {}
 
   bool OnMousePressed(const ui::MouseEvent& event) override {
     pressed_++;
     return true;
   }
 
-  void OnMouseReleased(const ui::MouseEvent& event) override { released_++; }
-
   void OnMouseEntered(const ui::MouseEvent& event) override { entered_++; }
 
   void OnMouseExited(const ui::MouseEvent& event) override { exited_++; }
 
   // Return the number of OnMouseEntered calls and reset the counter.
   int EnteredCalls() {
     int i = entered_;
     entered_ = 0;
     return i;
   }
 
   // Return the number of OnMouseExited calls and reset the counter.
   int ExitedCalls() {
     int i = exited_;
     exited_ = 0;
     return i;
   }
 
   int pressed() const { return pressed_; }
-  int released() const { return released_; }
 
  private:
-  int entered_ = 0;
-  int exited_ = 0;
+  int entered_;
+  int exited_;
 
-  int pressed_ = 0;
-  int released_ = 0;
+  int pressed_;
 
   DISALLOW_COPY_AND_ASSIGN(MouseView);
 };
 
 // A View that shows a different widget, sets capture on that widget, and
 // initiates a nested message-loop when it receives a mouse-press event.
 class NestedLoopCaptureView : public View {
  public:
   explicit NestedLoopCaptureView(Widget* widget) : widget_(widget) {}
   ~NestedLoopCaptureView() override {}
@@ skipping 225 matching lines @@
   widget1->CloseNow();
 }
 #endif  // defined(OS_WIN)
 
 TEST_F(WidgetTestInteractive, CaptureAutoReset) {
   Widget* toplevel = CreateTopLevelFramelessPlatformWidget();
   View* container = new View;
   toplevel->SetContentsView(container);
 
   EXPECT_FALSE(toplevel->HasCapture());
-  toplevel->SetCapture(nullptr);
+  toplevel->SetCapture(NULL);
   EXPECT_TRUE(toplevel->HasCapture());
 
   // By default, mouse release removes capture.
   gfx::Point click_location(45, 15);
   ui::MouseEvent release(ui::ET_MOUSE_RELEASED, click_location, click_location,
                          ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
                          ui::EF_LEFT_MOUSE_BUTTON);
   toplevel->OnMouseEvent(&release);
   EXPECT_FALSE(toplevel->HasCapture());
 
   // Now a mouse release shouldn't remove capture.
   toplevel->set_auto_release_capture(false);
-  toplevel->SetCapture(nullptr);
+  toplevel->SetCapture(NULL);
   EXPECT_TRUE(toplevel->HasCapture());
   toplevel->OnMouseEvent(&release);
   EXPECT_TRUE(toplevel->HasCapture());
   toplevel->ReleaseCapture();
   EXPECT_FALSE(toplevel->HasCapture());
 
-  toplevel->CloseNow();
-}
-
-// Tests capture when auto-release is disabled and events are captured to a
-// specific view.
-TEST_F(WidgetTestInteractive, CaptureToViewWithoutAutoRelease) {
-  Widget* widget = CreateTopLevelFramelessPlatformWidget();
-  MouseView* target_view = new MouseView;
-  widget->SetContentsView(target_view);
-
-  // Set capture to a specific view.
-  widget->set_auto_release_capture(false);
-  widget->SetCapture(target_view);
-  EXPECT_TRUE(widget->HasCapture());
-
-  // A click is routed to the view and capture is not released on mouse release.
-  gfx::Point point(12, 34);
-  ui::MouseEvent press(ui::ET_MOUSE_PRESSED, point, point,
-                       ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
-                       ui::EF_LEFT_MOUSE_BUTTON);
-  ui::MouseEvent release(ui::ET_MOUSE_RELEASED, point, point,
-                         ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
-                         ui::EF_LEFT_MOUSE_BUTTON);
-  widget->OnMouseEvent(&press);
-  widget->OnMouseEvent(&release);
-  EXPECT_EQ(1, target_view->pressed());
-  EXPECT_EQ(1, target_view->released());
-
-  // Future events are still routed to the view.
-  widget->OnMouseEvent(&press);
-  widget->OnMouseEvent(&release);
-  EXPECT_EQ(2, target_view->pressed());
-  EXPECT_EQ(2, target_view->released());
-
-  // Capture must be explicitly released.
-  EXPECT_TRUE(widget->HasCapture());
-  widget->ReleaseCapture();
-  EXPECT_FALSE(widget->HasCapture());
-
-  widget->CloseNow();
+  toplevel->Close();
+  RunPendingMessages();
 }
 
 TEST_F(WidgetTestInteractive, ResetCaptureOnGestureEnd) {
   Widget* toplevel = CreateTopLevelFramelessPlatformWidget();
   View* container = new View;
   toplevel->SetContentsView(container);
 
   View* gesture = new GestureCaptureView;
   gesture->SetBounds(0, 0, 30, 30);
   container->AddChildView(gesture);
@@ skipping 1306 matching lines @@
 
   ui::KeyEvent key_event2(key_event);
   widget->OnKeyEvent(&key_event2);
   EXPECT_FALSE(key_event2.stopped_propagation());
 
   widget->CloseNow();
 }
 
 }  // namespace test
 }  // namespace views