| Index: chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc
|
| diff --git a/chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc b/chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc
|
| index e20a9b5fcb2ed5b18c5bba6e39f7cf80a01cce9d..9a79097994cd7e4fdb7c0ad9f1425e5446cf41f3 100644
|
| --- a/chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc
|
| +++ b/chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc
|
| @@ -78,7 +78,7 @@ class AppShimHostTest : public testing::Test,
|
| }
|
|
|
| void SimulateDisconnect() {
|
| - implicit_cast<IPC::Listener*>(host_.release())->OnChannelError();
|
| + static_cast<IPC::Listener*>(host_.release())->OnChannelError();
|
| }
|
|
|
| protected:
|
| @@ -128,7 +128,7 @@ TEST_F(AppShimHostTest, TestLaunchAppWithHandler) {
|
| apps::AppShimHandler::RegisterHandler(kTestAppId, this);
|
| LaunchApp(apps::APP_SHIM_LAUNCH_NORMAL);
|
| EXPECT_EQ(kTestAppId,
|
| - implicit_cast<apps::AppShimHandler::Host*>(host())->GetAppId());
|
| + static_cast<apps::AppShimHandler::Host*>(host())->GetAppId());
|
| EXPECT_EQ(apps::APP_SHIM_LAUNCH_SUCCESS, GetLaunchResult());
|
| EXPECT_EQ(1, launch_count_);
|
| EXPECT_EQ(1, launch_now_count_);
|
| @@ -136,8 +136,8 @@ TEST_F(AppShimHostTest, TestLaunchAppWithHandler) {
|
| EXPECT_EQ(0, close_count_);
|
|
|
| // A second OnAppLaunchComplete is ignored.
|
| - implicit_cast<apps::AppShimHandler::Host*>(host())->
|
| - OnAppLaunchComplete(apps::APP_SHIM_LAUNCH_APP_NOT_FOUND);
|
| + static_cast<apps::AppShimHandler::Host*>(host())
|
| + ->OnAppLaunchComplete(apps::APP_SHIM_LAUNCH_APP_NOT_FOUND);
|
| EXPECT_EQ(apps::APP_SHIM_LAUNCH_SUCCESS, GetLaunchResult());
|
|
|
| EXPECT_TRUE(host()->ReceiveMessage(
|
| @@ -157,7 +157,7 @@ TEST_F(AppShimHostTest, TestNoLaunchNow) {
|
| apps::AppShimHandler::RegisterHandler(kTestAppId, this);
|
| LaunchApp(apps::APP_SHIM_LAUNCH_REGISTER_ONLY);
|
| EXPECT_EQ(kTestAppId,
|
| - implicit_cast<apps::AppShimHandler::Host*>(host())->GetAppId());
|
| + static_cast<apps::AppShimHandler::Host*>(host())->GetAppId());
|
| EXPECT_EQ(apps::APP_SHIM_LAUNCH_SUCCESS, GetLaunchResult());
|
| EXPECT_EQ(1, launch_count_);
|
| EXPECT_EQ(0, launch_now_count_);
|
|
|