diff options
| author | Yukawa@chromium.org <Yukawa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 16:00:08 +0000 |
|---|---|---|
| committer | Yukawa@chromium.org <Yukawa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 16:00:08 +0000 |
| commit | 749bf643e7d7f94df861c8b46e6b241ec92931dd (patch) | |
| tree | 5a6238110e0cafc21806c686aca675cf018c36c3 /chrome/browser/notifications/desktop_notifications_unittest.cc | |
| parent | 4a42bfa2a12341aa1e59b42822b9b887d261d10d (diff) | |
| download | chromium_src-749bf643e7d7f94df861c8b46e6b241ec92931dd.zip chromium_src-749bf643e7d7f94df861c8b46e6b241ec92931dd.tar.gz chromium_src-749bf643e7d7f94df861c8b46e6b241ec92931dd.tar.bz2 | |
Use platform-neutral initialize/shutdown functions for IME
This patch set replaces platform-specific initialize/shutdown
functions for IME with platform-neutral ones.
BUG=246534
Review URL: https://chromiumcodereview.appspot.com/16258007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications/desktop_notifications_unittest.cc')
| -rw-r--r-- | chrome/browser/notifications/desktop_notifications_unittest.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc index f63610f..1eaaf82 100644 --- a/chrome/browser/notifications/desktop_notifications_unittest.cc +++ b/chrome/browser/notifications/desktop_notifications_unittest.cc @@ -15,6 +15,7 @@ #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" #include "content/public/common/show_desktop_notification_params.h" +#include "ui/base/ime/input_method_initializer.h" #include "ui/message_center/message_center.h" #if defined(USE_ASH) @@ -27,10 +28,6 @@ #include "ui/compositor/scoped_animation_duration_scale_mode.h" #endif -#if defined(OS_WIN) -#include "base/win/metro.h" -#include "ui/base/ime/win/tsf_bridge.h" -#endif using content::BrowserThread; @@ -105,10 +102,7 @@ DesktopNotificationsTest::~DesktopNotificationsTest() { } void DesktopNotificationsTest::SetUp() { -#if defined(OS_WIN) - if (base::win::IsTSFAwareRequired()) - ui::TSFBridge::Initialize(); -#endif + ui::InitializeInputMethodForTesting(); #if defined(USE_ASH) WebKit::initialize(webkit_platform_support_.Get()); ui::ScopedAnimationDurationScaleMode normal_duration_mode( @@ -144,6 +138,7 @@ void DesktopNotificationsTest::TearDown() { aura::Env::DeleteInstance(); WebKit::shutdown(); #endif + ui::ShutdownInputMethodForTesting(); } content::ShowDesktopNotificationHostMsgParams |