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_manager_mac.h" | 5 #include "chrome/browser/apps/app_shim/app_shim_host_manager_mac.h" |
6 | 6 |
7 #include <unistd.h> | 7 #include <unistd.h> |
8 | 8 |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
12 #include "chrome/browser/apps/app_shim/app_shim_handler_mac.h" | 12 #include "chrome/browser/apps/app_shim/app_shim_handler_mac.h" |
13 #include "chrome/browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.h
" | 13 #include "chrome/browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.h
" |
14 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
15 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
16 #include "chrome/browser/ui/browser.h" | 16 #include "chrome/browser/ui/browser.h" |
17 #include "chrome/common/chrome_paths.h" | 17 #include "chrome/common/chrome_paths.h" |
18 #include "chrome/common/chrome_version_info.h" | |
19 #include "chrome/common/mac/app_mode_common.h" | 18 #include "chrome/common/mac/app_mode_common.h" |
20 #include "chrome/common/mac/app_shim_messages.h" | 19 #include "chrome/common/mac/app_shim_messages.h" |
21 #include "chrome/test/base/in_process_browser_test.h" | 20 #include "chrome/test/base/in_process_browser_test.h" |
| 21 #include "components/version_info/version_info.h" |
22 #include "content/public/test/test_utils.h" | 22 #include "content/public/test/test_utils.h" |
23 #include "ipc/ipc_channel_proxy.h" | 23 #include "ipc/ipc_channel_proxy.h" |
24 #include "ipc/ipc_listener.h" | 24 #include "ipc/ipc_listener.h" |
25 #include "ipc/ipc_message.h" | 25 #include "ipc/ipc_message.h" |
26 | 26 |
27 namespace { | 27 namespace { |
28 | 28 |
29 const char kTestAppMode[] = "test_app"; | 29 const char kTestAppMode[] = "test_app"; |
30 | 30 |
31 // A test version of the AppShimController IPC client in chrome_main_app_mode. | 31 // A test version of the AppShimController IPC client in chrome_main_app_mode. |
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
273 EXPECT_TRUE(base::PathExists(symlink_path_)); | 273 EXPECT_TRUE(base::PathExists(symlink_path_)); |
274 | 274 |
275 // Check that the symlink has been replaced. | 275 // Check that the symlink has been replaced. |
276 base::FilePath socket_path; | 276 base::FilePath socket_path; |
277 ASSERT_TRUE(base::ReadSymbolicLink(symlink_path_, &socket_path)); | 277 ASSERT_TRUE(base::ReadSymbolicLink(symlink_path_, &socket_path)); |
278 EXPECT_EQ(app_mode::kAppShimSocketShortName, socket_path.BaseName().value()); | 278 EXPECT_EQ(app_mode::kAppShimSocketShortName, socket_path.BaseName().value()); |
279 | 279 |
280 // Check that the RunningChromeVersion file is correctly written. | 280 // Check that the RunningChromeVersion file is correctly written. |
281 base::FilePath version; | 281 base::FilePath version; |
282 EXPECT_TRUE(base::ReadSymbolicLink(version_path_, &version)); | 282 EXPECT_TRUE(base::ReadSymbolicLink(version_path_, &version)); |
283 EXPECT_EQ(chrome::VersionInfo().Version(), version.value()); | 283 EXPECT_EQ(version_info::GetVersionNumber(), version.value()); |
284 } | 284 } |
285 | 285 |
286 } // namespace | 286 } // namespace |
OLD | NEW |