OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/apps/app_shim/app_shim_host_mac.h" | 5 #include "chrome/browser/apps/app_shim/app_shim_host_mac.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/memory/scoped_vector.h" | 10 #include "base/memory/scoped_vector.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 launch_type, | 67 launch_type, |
68 std::vector<base::FilePath>()))); | 68 std::vector<base::FilePath>()))); |
69 } | 69 } |
70 | 70 |
71 apps::AppShimLaunchResult GetLaunchResult() { | 71 apps::AppShimLaunchResult GetLaunchResult() { |
72 EXPECT_EQ(1u, host()->sent_messages().size()); | 72 EXPECT_EQ(1u, host()->sent_messages().size()); |
73 IPC::Message* message = host()->sent_messages()[0]; | 73 IPC::Message* message = host()->sent_messages()[0]; |
74 EXPECT_EQ(AppShimMsg_LaunchApp_Done::ID, message->type()); | 74 EXPECT_EQ(AppShimMsg_LaunchApp_Done::ID, message->type()); |
75 AppShimMsg_LaunchApp_Done::Param param; | 75 AppShimMsg_LaunchApp_Done::Param param; |
76 AppShimMsg_LaunchApp_Done::Read(message, ¶m); | 76 AppShimMsg_LaunchApp_Done::Read(message, ¶m); |
77 return get<0>(param); | 77 return base::get<0>(param); |
78 } | 78 } |
79 | 79 |
80 void SimulateDisconnect() { | 80 void SimulateDisconnect() { |
81 implicit_cast<IPC::Listener*>(host_.release())->OnChannelError(); | 81 implicit_cast<IPC::Listener*>(host_.release())->OnChannelError(); |
82 } | 82 } |
83 | 83 |
84 protected: | 84 protected: |
85 void OnShimLaunch(Host* host, | 85 void OnShimLaunch(Host* host, |
86 apps::AppShimLaunchType launch_type, | 86 apps::AppShimLaunchType launch_type, |
87 const std::vector<base::FilePath>& file) override { | 87 const std::vector<base::FilePath>& file) override { |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 apps::AppShimHandler::RemoveHandler(kTestAppId); | 166 apps::AppShimHandler::RemoveHandler(kTestAppId); |
167 } | 167 } |
168 | 168 |
169 TEST_F(AppShimHostTest, TestFailLaunch) { | 169 TEST_F(AppShimHostTest, TestFailLaunch) { |
170 apps::AppShimHandler::RegisterHandler(kTestAppId, this); | 170 apps::AppShimHandler::RegisterHandler(kTestAppId, this); |
171 launch_result_ = apps::APP_SHIM_LAUNCH_APP_NOT_FOUND; | 171 launch_result_ = apps::APP_SHIM_LAUNCH_APP_NOT_FOUND; |
172 LaunchApp(apps::APP_SHIM_LAUNCH_NORMAL); | 172 LaunchApp(apps::APP_SHIM_LAUNCH_NORMAL); |
173 EXPECT_EQ(apps::APP_SHIM_LAUNCH_APP_NOT_FOUND, GetLaunchResult()); | 173 EXPECT_EQ(apps::APP_SHIM_LAUNCH_APP_NOT_FOUND, GetLaunchResult()); |
174 apps::AppShimHandler::RemoveHandler(kTestAppId); | 174 apps::AppShimHandler::RemoveHandler(kTestAppId); |
175 } | 175 } |
OLD | NEW |