diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-09 02:55:43 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-09 02:55:43 +0000 |
| commit | 5651c58492d1ed28ad17c7fd0c62bafd310ef498 (patch) | |
| tree | 90ba1506378b9a7db0cd06d23bed3deb0495bdde /ui/message_center | |
| parent | a869776abbe932cc88af0fd42a6583276c356612 (diff) | |
| download | chromium_src-5651c58492d1ed28ad17c7fd0c62bafd310ef498.zip chromium_src-5651c58492d1ed28ad17c7fd0c62bafd310ef498.tar.gz chromium_src-5651c58492d1ed28ad17c7fd0c62bafd310ef498.tar.bz2 | |
Refactor ui cocoa test support into a helper target isolated from ui/base/
That way events can reuse it. This will be necessary to move the
remaining events files from ui/base to ui/events.
BUG=299841
TEST=None
R=sadrul@chromium.org,thakis@chromium.org,ben@chromium.org
Review URL: https://codereview.chromium.org/156053005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/message_center')
8 files changed, 8 insertions, 8 deletions
diff --git a/ui/message_center/cocoa/notification_controller_unittest.mm b/ui/message_center/cocoa/notification_controller_unittest.mm index e01745a..fefee79 100644 --- a/ui/message_center/cocoa/notification_controller_unittest.mm +++ b/ui/message_center/cocoa/notification_controller_unittest.mm @@ -10,7 +10,7 @@ #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #import "ui/base/cocoa/hover_image_button.h" -#import "ui/base/test/ui_cocoa_test_helper.h" +#import "ui/gfx/test/ui_cocoa_test_helper.h" #include "ui/message_center/fake_message_center.h" #include "ui/message_center/message_center_style.h" #include "ui/message_center/notification.h" diff --git a/ui/message_center/cocoa/popup_collection_unittest.mm b/ui/message_center/cocoa/popup_collection_unittest.mm index 63498a2..925cbd3 100644 --- a/ui/message_center/cocoa/popup_collection_unittest.mm +++ b/ui/message_center/cocoa/popup_collection_unittest.mm @@ -10,7 +10,7 @@ #include "base/run_loop.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#import "ui/base/test/ui_cocoa_test_helper.h" +#import "ui/gfx/test/ui_cocoa_test_helper.h" #import "ui/message_center/cocoa/notification_controller.h" #import "ui/message_center/cocoa/popup_controller.h" #include "ui/message_center/message_center.h" diff --git a/ui/message_center/cocoa/popup_controller_unittest.mm b/ui/message_center/cocoa/popup_controller_unittest.mm index 80d9768..73e142b 100644 --- a/ui/message_center/cocoa/popup_controller_unittest.mm +++ b/ui/message_center/cocoa/popup_controller_unittest.mm @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#import "ui/base/test/ui_cocoa_test_helper.h" +#import "ui/gfx/test/ui_cocoa_test_helper.h" #include "ui/message_center/notification.h" using base::ASCIIToUTF16; diff --git a/ui/message_center/cocoa/settings_controller_unittest.mm b/ui/message_center/cocoa/settings_controller_unittest.mm index 74f9f07..c686fcf 100644 --- a/ui/message_center/cocoa/settings_controller_unittest.mm +++ b/ui/message_center/cocoa/settings_controller_unittest.mm @@ -5,7 +5,7 @@ #import "ui/message_center/cocoa/settings_controller.h" #include "base/strings/utf_string_conversions.h" -#import "ui/base/test/ui_cocoa_test_helper.h" +#import "ui/gfx/test/ui_cocoa_test_helper.h" #include "ui/message_center/fake_notifier_settings_provider.h" @implementation MCSettingsController (TestingInterface) diff --git a/ui/message_center/cocoa/status_item_view_unittest.mm b/ui/message_center/cocoa/status_item_view_unittest.mm index 424d20f..f673a11 100644 --- a/ui/message_center/cocoa/status_item_view_unittest.mm +++ b/ui/message_center/cocoa/status_item_view_unittest.mm @@ -5,7 +5,7 @@ #import "ui/message_center/cocoa/status_item_view.h" #include "base/mac/scoped_nsobject.h" -#import "ui/base/test/ui_cocoa_test_helper.h" +#import "ui/gfx/test/ui_cocoa_test_helper.h" class StatusItemViewTest : public ui::CocoaTest { public: diff --git a/ui/message_center/cocoa/tray_controller_unittest.mm b/ui/message_center/cocoa/tray_controller_unittest.mm index 516cf8f..285e8b6 100644 --- a/ui/message_center/cocoa/tray_controller_unittest.mm +++ b/ui/message_center/cocoa/tray_controller_unittest.mm @@ -6,7 +6,7 @@ #include "base/mac/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" -#import "ui/base/test/ui_cocoa_test_helper.h" +#import "ui/gfx/test/ui_cocoa_test_helper.h" #include "ui/message_center/message_center.h" #include "ui/message_center/message_center_tray.h" diff --git a/ui/message_center/cocoa/tray_view_controller_unittest.mm b/ui/message_center/cocoa/tray_view_controller_unittest.mm index 9fdb4fb..156f719 100644 --- a/ui/message_center/cocoa/tray_view_controller_unittest.mm +++ b/ui/message_center/cocoa/tray_view_controller_unittest.mm @@ -8,7 +8,7 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#import "ui/base/test/ui_cocoa_test_helper.h" +#import "ui/gfx/test/ui_cocoa_test_helper.h" #include "ui/message_center/fake_notifier_settings_provider.h" #include "ui/message_center/message_center.h" #include "ui/message_center/message_center_impl.h" diff --git a/ui/message_center/message_center.gyp b/ui/message_center/message_center.gyp index 149d8a3..555ec05 100644 --- a/ui/message_center/message_center.gyp +++ b/ui/message_center/message_center.gyp @@ -206,7 +206,7 @@ }], ['OS=="mac"', { 'dependencies': [ - '../ui_unittests.gyp:ui_test_support', + '../gfx/gfx.gyp:gfx_test_support', ], }], ['toolkit_views==1', { |