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

Side by Side Diff: chrome/browser/image_decoder_browsertest.cc

Issue 1071453002: Fail all started requests if the utility process crashes or fails to start. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@racy-image-decoder
Patch Set: Rebase Created 5 years, 7 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 | « chrome/browser/image_decoder.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/image_decoder.h" 5 #include "chrome/browser/image_decoder.h"
6 6
7 #if defined(OS_POSIX)
8 #include <sys/types.h>
9 #include <signal.h>
10 #endif
11
7 #include "chrome/test/base/in_process_browser_test.h" 12 #include "chrome/test/base/in_process_browser_test.h"
13 #include "content/public/browser/browser_child_process_observer.h"
8 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
15 #include "content/public/browser/child_process_data.h"
9 #include "content/public/test/test_utils.h" 16 #include "content/public/test/test_utils.h"
10 17
11 using content::BrowserThread; 18 using content::BrowserThread;
12 19
13 namespace { 20 namespace {
14 21
15 class TestImageRequest : public ImageDecoder::ImageRequest { 22 class TestImageRequest : public ImageDecoder::ImageRequest {
16 public: 23 public:
17 explicit TestImageRequest(const base::Closure& quit_closure) 24 explicit TestImageRequest(const base::Closure& quit_closure)
18 : quit_closure_(quit_closure), 25 : quit_closure_(quit_closure),
(...skipping 20 matching lines...) Expand all
39 quit_called_ = true; 46 quit_called_ = true;
40 quit_closure_.Run(); 47 quit_closure_.Run();
41 } 48 }
42 49
43 base::Closure quit_closure_; 50 base::Closure quit_closure_;
44 bool quit_called_; 51 bool quit_called_;
45 52
46 DISALLOW_COPY_AND_ASSIGN(TestImageRequest); 53 DISALLOW_COPY_AND_ASSIGN(TestImageRequest);
47 }; 54 };
48 55
56 class KillProcessObserver : public content::BrowserChildProcessObserver {
57 public:
58 KillProcessObserver() {
59 Add(this);
60 }
61
62 ~KillProcessObserver() override {
63 Remove(this);
64 }
65
66 private:
67 void BrowserChildProcessHostConnected(
68 const content::ChildProcessData& data) override {
69 base::ProcessHandle handle = data.handle;
70
71 if (handle == base::kNullProcessHandle)
72 return;
73
74 #if defined(OS_WIN)
75 // On windows, duplicate the process handle since base::Process closes it on
76 // destruction.
77 base::ProcessHandle out_handle;
78 if (!::DuplicateHandle(GetCurrentProcess(), handle,
79 GetCurrentProcess(), &out_handle,
80 0, FALSE, DUPLICATE_SAME_ACCESS))
81 return;
82 handle = out_handle;
83 #endif
84
85 EXPECT_TRUE(base::Process(handle).Terminate(0, true));
86 }
87 };
88
89 #if defined(OS_POSIX)
90 class FreezeProcessObserver : public content::BrowserChildProcessObserver {
91 public:
92 FreezeProcessObserver() {
93 Add(this);
94 }
95
96 ~FreezeProcessObserver() override {
97 Remove(this);
98 }
99
100 private:
101 void BrowserChildProcessHostConnected(
102 const content::ChildProcessData& data) override {
103 if (data.handle != base::kNullProcessHandle)
104 EXPECT_EQ(0, kill(data.handle, SIGSTOP));
105 }
106 };
107 #endif // defined(OS_POSIX)
108
49 } // namespace 109 } // namespace
50 110
51 class ImageDecoderBrowserTest : public InProcessBrowserTest { 111 class ImageDecoderBrowserTest : public InProcessBrowserTest {
52 }; 112 };
53 113
54 IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, Basic) { 114 IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, Basic) {
55 scoped_refptr<content::MessageLoopRunner> runner = 115 scoped_refptr<content::MessageLoopRunner> runner =
56 new content::MessageLoopRunner; 116 new content::MessageLoopRunner;
57 TestImageRequest test_request(runner->QuitClosure()); 117 TestImageRequest test_request(runner->QuitClosure());
58 ImageDecoder::Start(&test_request, std::string()); 118 ImageDecoder::Start(&test_request, std::string());
59 runner->Run(); 119 runner->Run();
60 } 120 }
61 121
62 IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, StartAndDestroy) { 122 IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, StartAndDestroy) {
63 scoped_refptr<content::MessageLoopRunner> runner = 123 scoped_refptr<content::MessageLoopRunner> runner =
64 new content::MessageLoopRunner; 124 new content::MessageLoopRunner;
65 scoped_ptr<TestImageRequest> test_request( 125 scoped_ptr<TestImageRequest> test_request(
66 new TestImageRequest(runner->QuitClosure())); 126 new TestImageRequest(runner->QuitClosure()));
67 ImageDecoder::Start(test_request.get(), std::string()); 127 ImageDecoder::Start(test_request.get(), std::string());
68 test_request.reset(); 128 test_request.reset();
69 runner->Run(); 129 runner->Run();
70 } 130 }
131
132 IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, StartAndKillProcess) {
133 KillProcessObserver observer;
134 scoped_refptr<content::MessageLoopRunner> runner =
135 new content::MessageLoopRunner;
136 scoped_ptr<TestImageRequest> test_request(
137 new TestImageRequest(runner->QuitClosure()));
138 ImageDecoder::Start(test_request.get(), std::string());
139 runner->Run();
140 }
141
142 #if defined(OS_POSIX)
143 IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, StartAndFreezeProcess) {
144 FreezeProcessObserver observer;
145 scoped_refptr<content::MessageLoopRunner> runner =
146 new content::MessageLoopRunner;
147 scoped_ptr<TestImageRequest> test_request(
148 new TestImageRequest(runner->QuitClosure()));
149 ImageDecoder::Start(test_request.get(), std::string());
150 runner->Run();
151 }
152 #endif // defined(OS_POSIX)
OLDNEW
« no previous file with comments | « chrome/browser/image_decoder.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698