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

Side by Side Diff: content/browser/utility_process_host_impl_browsertest.cc

Issue 2009033002: Revert of [mojo] Use a pipe path to initialise Mojo in elevated utility processes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « content/browser/child_process_launcher.cc ('k') | content/child/child_thread_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/run_loop.h" 6 #include "base/run_loop.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "content/public/browser/browser_thread.h" 8 #include "content/public/browser/browser_thread.h"
9 #include "content/public/browser/utility_process_host.h" 9 #include "content/public/browser/utility_process_host.h"
10 #include "content/public/browser/utility_process_host_client.h" 10 #include "content/public/browser/utility_process_host_client.h"
11 #include "content/public/common/service_registry.h" 11 #include "content/public/common/service_registry.h"
12 #include "content/public/test/content_browser_test.h" 12 #include "content/public/test/content_browser_test.h"
13 #include "content/public/test/content_browser_test_utils.h" 13 #include "content/public/test/content_browser_test_utils.h"
14 #include "content/public/test/test_mojo_service.mojom.h" 14 #include "content/public/test/test_mojo_service.mojom.h"
15 15
16 namespace content { 16 namespace content {
17 17
18 class UtilityProcessHostImplBrowserTest : public ContentBrowserTest { 18 class UtilityProcessHostImplBrowserTest : public ContentBrowserTest {
19 public: 19 public:
20 void RunUtilityProcess(bool elevated) { 20 void RunUtilityProcess() {
21 base::RunLoop run_loop; 21 base::RunLoop run_loop;
22 done_closure_ = run_loop.QuitClosure(); 22 done_closure_ = run_loop.QuitClosure();
23 BrowserThread::PostTask( 23 BrowserThread::PostTask(
24 BrowserThread::IO, FROM_HERE, 24 BrowserThread::IO, FROM_HERE,
25 base::Bind( 25 base::Bind(
26 &UtilityProcessHostImplBrowserTest::RunUtilityProcessOnIOThread, 26 &UtilityProcessHostImplBrowserTest::RunUtilityProcessOnIOThread,
27 base::Unretained(this), elevated)); 27 base::Unretained(this)));
28 run_loop.Run(); 28 run_loop.Run();
29 } 29 }
30 30
31 protected: 31 protected:
32 void RunUtilityProcessOnIOThread(bool elevated) { 32 void RunUtilityProcessOnIOThread() {
33 UtilityProcessHost* host = UtilityProcessHost::Create(nullptr, nullptr); 33 UtilityProcessHost* host = UtilityProcessHost::Create(nullptr, nullptr);
34 host->SetName(base::ASCIIToUTF16("TestProcess")); 34 host->SetName(base::ASCIIToUTF16("TestProcess"));
35 #if defined(OS_WIN)
36 if (elevated)
37 host->ElevatePrivileges();
38 #endif
39 EXPECT_TRUE(host->Start()); 35 EXPECT_TRUE(host->Start());
40 36
41 ServiceRegistry* service_registry = host->GetServiceRegistry(); 37 ServiceRegistry* service_registry = host->GetServiceRegistry();
42 service_registry->ConnectToRemoteService(mojo::GetProxy(&service_)); 38 service_registry->ConnectToRemoteService(mojo::GetProxy(&service_));
43 service_->DoSomething(base::Bind( 39 service_->DoSomething(base::Bind(
44 &UtilityProcessHostImplBrowserTest::OnSomething, 40 &UtilityProcessHostImplBrowserTest::OnSomething,
45 base::Unretained(this))); 41 base::Unretained(this)));
46 } 42 }
47 43
48 void OnSomething() { 44 void OnSomething() {
49 service_.reset(); 45 service_.reset();
50 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, done_closure_); 46 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, done_closure_);
51 } 47 }
52 48
53 mojom::TestMojoServicePtr service_; 49 mojom::TestMojoServicePtr service_;
54 base::Closure done_closure_; 50 base::Closure done_closure_;
55 }; 51 };
56 52
57 IN_PROC_BROWSER_TEST_F(UtilityProcessHostImplBrowserTest, LaunchProcess) { 53 IN_PROC_BROWSER_TEST_F(UtilityProcessHostImplBrowserTest, LaunchProcess) {
58 RunUtilityProcess(false); 54 RunUtilityProcess();
59 } 55 }
60 56
61 #if defined(OS_WIN)
62 IN_PROC_BROWSER_TEST_F(UtilityProcessHostImplBrowserTest,
63 LaunchElevatedProcess) {
64 RunUtilityProcess(true);
65 }
66 #endif
67
68 } // namespace content 57 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/child_process_launcher.cc ('k') | content/child/child_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698