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

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

Issue 836393007: Update {virtual,override,final} for chrome/ to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanups Created 5 years, 11 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 // Client should not get any channel errors for the current set of tests. 80 // Client should not get any channel errors for the current set of tests.
81 PLOG(FATAL) << "ChannelError"; 81 PLOG(FATAL) << "ChannelError";
82 } 82 }
83 83
84 // Browser Test for AppShimHostManager to test IPC interactions across the 84 // Browser Test for AppShimHostManager to test IPC interactions across the
85 // UNIX domain socket. 85 // UNIX domain socket.
86 class AppShimHostManagerBrowserTest : public InProcessBrowserTest, 86 class AppShimHostManagerBrowserTest : public InProcessBrowserTest,
87 public apps::AppShimHandler { 87 public apps::AppShimHandler {
88 public: 88 public:
89 AppShimHostManagerBrowserTest(); 89 AppShimHostManagerBrowserTest();
90 virtual ~AppShimHostManagerBrowserTest(); 90 ~AppShimHostManagerBrowserTest() override;
91 91
92 protected: 92 protected:
93 // Wait for OnShimLaunch, then send a quit, and wait for the response. Used to 93 // Wait for OnShimLaunch, then send a quit, and wait for the response. Used to
94 // test launch behavior. 94 // test launch behavior.
95 void RunAndExitGracefully(); 95 void RunAndExitGracefully();
96 96
97 // InProcessBrowserTest overrides: 97 // InProcessBrowserTest overrides:
98 void SetUpOnMainThread() override; 98 void SetUpOnMainThread() override;
99 void TearDownOnMainThread() override; 99 void TearDownOnMainThread() override;
100 100
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 ASSERT_TRUE(base::ReadSymbolicLink(symlink_path_, &socket_path)); 278 ASSERT_TRUE(base::ReadSymbolicLink(symlink_path_, &socket_path));
279 EXPECT_EQ(app_mode::kAppShimSocketShortName, socket_path.BaseName().value()); 279 EXPECT_EQ(app_mode::kAppShimSocketShortName, socket_path.BaseName().value());
280 280
281 // Check that the RunningChromeVersion file is correctly written. 281 // Check that the RunningChromeVersion file is correctly written.
282 base::FilePath version; 282 base::FilePath version;
283 EXPECT_TRUE(base::ReadSymbolicLink(version_path_, &version)); 283 EXPECT_TRUE(base::ReadSymbolicLink(version_path_, &version));
284 EXPECT_EQ(chrome::VersionInfo().Version(), version.value()); 284 EXPECT_EQ(chrome::VersionInfo().Version(), version.value());
285 } 285 }
286 286
287 } // namespace 287 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698