Split cocoa_event_utils in two parts.

ui/events/cocoa/cocoa_event_utils_unittest.mm

Index: ui/events/cocoa/cocoa_event_utils_unittest.mm
diff --git a/ui/base/cocoa/cocoa_event_utils_unittest.mm b/ui/events/cocoa/cocoa_event_utils_unittest.mm
similarity index 60%
rename from ui/base/cocoa/cocoa_event_utils_unittest.mm
rename to ui/events/cocoa/cocoa_event_utils_unittest.mm
index f0c8afa38091e6451b7fd287af32f43ad2934608..b49fb89362fdee8e4a34ad6082183ddb2dff40bd 100644
--- a/ui/base/cocoa/cocoa_event_utils_unittest.mm
+++ b/ui/events/cocoa/cocoa_event_utils_unittest.mm
@@ -2,68 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "ui/events/cocoa/cocoa_event_utils.h"
+
 #import <objc/objc-class.h>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
-#include "ui/base/cocoa/cocoa_event_utils.h"
 #include "ui/events/event_constants.h"
 #import "ui/events/test/cocoa_test_event_utils.h"
 #import "ui/gfx/test/ui_cocoa_test_helper.h"
 
-// We provide a donor class with a specially modified |modifierFlags|
-// implementation that we swap with NSEvent's. This is because we can't create a
-// NSEvent that represents a middle click with modifiers.
-@interface TestEvent : NSObject
-@end
-@implementation TestEvent
-- (NSUInteger)modifierFlags { return NSShiftKeyMask; }
-@end
-
 namespace ui {
 
 namespace {
 
-class EventUtilsTest : public CocoaTest {
+class CocoaEventUtilsTest : public CocoaTest {
 };
 
-TEST_F(EventUtilsTest, TestWindowOpenDispositionFromNSEvent) {
-  // Left Click = same tab.
-  NSEvent* me = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp, 0);
-  EXPECT_EQ(CURRENT_TAB, WindowOpenDispositionFromNSEvent(me));
-
-  // Middle Click = new background tab.
-  me = cocoa_test_event_utils::MouseEventWithType(NSOtherMouseUp, 0);
-  EXPECT_EQ(NEW_BACKGROUND_TAB, WindowOpenDispositionFromNSEvent(me));
-
-  // Shift+Middle Click = new foreground tab.
-  {
-    ScopedClassSwizzler swizzler([NSEvent class], [TestEvent class],
-                                 @selector(modifierFlags));
-    me = cocoa_test_event_utils::MouseEventWithType(NSOtherMouseUp,
-                                                    NSShiftKeyMask);
-    EXPECT_EQ(NEW_FOREGROUND_TAB, WindowOpenDispositionFromNSEvent(me));
-  }
-
-  // Cmd+Left Click = new background tab.
-  me = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp,
-                                                  NSCommandKeyMask);
-  EXPECT_EQ(NEW_BACKGROUND_TAB, WindowOpenDispositionFromNSEvent(me));
-
-  // Cmd+Shift+Left Click = new foreground tab.
-  me = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp,
-                                              NSCommandKeyMask |
-                                              NSShiftKeyMask);
-  EXPECT_EQ(NEW_FOREGROUND_TAB, WindowOpenDispositionFromNSEvent(me));
-
-  // Shift+Left Click = new window
-  me = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp,
-                                                  NSShiftKeyMask);
-  EXPECT_EQ(NEW_WINDOW, WindowOpenDispositionFromNSEvent(me));
-}
-
-
-TEST_F(EventUtilsTest, TestEventFlagsFromNSEvent) {
+TEST_F(CocoaEventUtilsTest, TestEventFlagsFromNSEvent) {
   // Left click.
   NSEvent* left = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseUp, 0);
   EXPECT_EQ(EF_LEFT_MOUSE_BUTTON, EventFlagsFromNSEvent(left));