OLD | NEW |
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 #include "base/macros.h" |
| 8 #include "build/build_config.h" |
7 #include "chrome/grit/generated_resources.h" | 9 #include "chrome/grit/generated_resources.h" |
8 #include "chrome/test/base/in_process_browser_test.h" | 10 #include "chrome/test/base/in_process_browser_test.h" |
9 #include "content/public/browser/browser_child_process_observer.h" | 11 #include "content/public/browser/browser_child_process_observer.h" |
10 #include "content/public/browser/browser_thread.h" | 12 #include "content/public/browser/browser_thread.h" |
11 #include "content/public/browser/child_process_data.h" | 13 #include "content/public/browser/child_process_data.h" |
12 #include "content/public/test/test_utils.h" | 14 #include "content/public/test/test_utils.h" |
13 #include "ui/base/l10n/l10n_util.h" | 15 #include "ui/base/l10n/l10n_util.h" |
14 | 16 |
15 using content::BrowserThread; | 17 using content::BrowserThread; |
16 | 18 |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 new content::MessageLoopRunner; | 170 new content::MessageLoopRunner; |
169 TestImageRequest test_request(runner->QuitClosure()); | 171 TestImageRequest test_request(runner->QuitClosure()); |
170 ImageDecoder::Start(&test_request, GetValidPngString()); | 172 ImageDecoder::Start(&test_request, GetValidPngString()); |
171 runner->Run(); | 173 runner->Run(); |
172 if (!test_request.decode_succeeded()) { | 174 if (!test_request.decode_succeeded()) { |
173 // The UI thread won the race. Make sure the utility process did get killed. | 175 // The UI thread won the race. Make sure the utility process did get killed. |
174 EXPECT_TRUE(observer.did_kill()); | 176 EXPECT_TRUE(observer.did_kill()); |
175 } | 177 } |
176 // Else the IO thread won the race and the image got decoded. Oh well. | 178 // Else the IO thread won the race and the image got decoded. Oh well. |
177 } | 179 } |
OLD | NEW |