Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Side by Side Diff: chrome/browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm

Issue 1143343005: chrome/browser: Remove use of MessageLoopProxy and deprecated MessageLoop APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 base::FilePath user_data_dir; 58 base::FilePath user_data_dir;
59 CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)); 59 CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
60 base::FilePath symlink_path = 60 base::FilePath symlink_path =
61 user_data_dir.Append(app_mode::kAppShimSocketSymlinkName); 61 user_data_dir.Append(app_mode::kAppShimSocketSymlinkName);
62 62
63 base::FilePath socket_path; 63 base::FilePath socket_path;
64 CHECK(base::ReadSymbolicLink(symlink_path, &socket_path)); 64 CHECK(base::ReadSymbolicLink(symlink_path, &socket_path));
65 app_mode::VerifySocketPermissions(socket_path); 65 app_mode::VerifySocketPermissions(socket_path);
66 66
67 IPC::ChannelHandle handle(socket_path.value()); 67 IPC::ChannelHandle handle(socket_path.value());
68 channel_ = IPC::ChannelProxy::Create(handle, 68 channel_ = IPC::ChannelProxy::Create(handle, IPC::Channel::MODE_NAMED_CLIENT,
69 IPC::Channel::MODE_NAMED_CLIENT, 69 this, io_thread_.task_runner().get());
70 this,
71 io_thread_.message_loop_proxy().get());
72 } 70 }
73 71
74 TestShimClient::~TestShimClient() {} 72 TestShimClient::~TestShimClient() {}
75 73
76 bool TestShimClient::OnMessageReceived(const IPC::Message& message) { 74 bool TestShimClient::OnMessageReceived(const IPC::Message& message) {
77 return true; 75 return true;
78 } 76 }
79 77
80 void TestShimClient::OnChannelError() { 78 void TestShimClient::OnChannelError() {
81 // Client should not get any channel errors for the current set of tests. 79 // Client should not get any channel errors for the current set of tests.
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 ASSERT_TRUE(base::ReadSymbolicLink(symlink_path_, &socket_path)); 277 ASSERT_TRUE(base::ReadSymbolicLink(symlink_path_, &socket_path));
280 EXPECT_EQ(app_mode::kAppShimSocketShortName, socket_path.BaseName().value()); 278 EXPECT_EQ(app_mode::kAppShimSocketShortName, socket_path.BaseName().value());
281 279
282 // Check that the RunningChromeVersion file is correctly written. 280 // Check that the RunningChromeVersion file is correctly written.
283 base::FilePath version; 281 base::FilePath version;
284 EXPECT_TRUE(base::ReadSymbolicLink(version_path_, &version)); 282 EXPECT_TRUE(base::ReadSymbolicLink(version_path_, &version));
285 EXPECT_EQ(chrome::VersionInfo().Version(), version.value()); 283 EXPECT_EQ(chrome::VersionInfo().Version(), version.value());
286 } 284 }
287 285
288 } // namespace 286 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/android/signin/signin_manager_android.cc ('k') | chrome/browser/apps/drive/drive_app_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698