OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <deque> | 5 #include <deque> |
6 #include <vector> | 6 #include <vector> |
7 | 7 |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
285 bool OnMessageReceived(const IPC::Message& message) override { | 285 bool OnMessageReceived(const IPC::Message& message) override { |
286 return false; | 286 return false; |
287 } | 287 } |
288 | 288 |
289 ChannelDestructionWatcher* watcher_; | 289 ChannelDestructionWatcher* watcher_; |
290 | 290 |
291 DISALLOW_COPY_AND_ASSIGN(DestructionMessageFilter); | 291 DISALLOW_COPY_AND_ASSIGN(DestructionMessageFilter); |
292 }; | 292 }; |
293 | 293 |
294 void OnChannelDestroyed() { | 294 void OnChannelDestroyed() { |
295 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 295 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
296 | 296 |
297 EXPECT_FALSE(channel_destroyed_); | 297 EXPECT_FALSE(channel_destroyed_); |
298 channel_destroyed_ = true; | 298 channel_destroyed_ = true; |
299 run_loop_.Quit(); | 299 run_loop_.Quit(); |
300 } | 300 } |
301 | 301 |
302 bool channel_destroyed_; | 302 bool channel_destroyed_; |
303 base::RunLoop run_loop_; | 303 base::RunLoop run_loop_; |
304 | 304 |
305 DISALLOW_COPY_AND_ASSIGN(ChannelDestructionWatcher); | 305 DISALLOW_COPY_AND_ASSIGN(ChannelDestructionWatcher); |
(...skipping 3747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4053 browser()->tab_strip_model()->GetActiveWebContents(); | 4053 browser()->tab_strip_model()->GetActiveWebContents(); |
4054 bool display_test_result = false; | 4054 bool display_test_result = false; |
4055 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents, | 4055 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents, |
4056 "DidDisplayReallyPass()", | 4056 "DidDisplayReallyPass()", |
4057 &display_test_result)); | 4057 &display_test_result)); |
4058 ASSERT_TRUE(display_test_result); | 4058 ASSERT_TRUE(display_test_result); |
4059 } | 4059 } |
4060 #endif // !defined(DISABLE_NACL) | 4060 #endif // !defined(DISABLE_NACL) |
4061 | 4061 |
4062 } // namespace prerender | 4062 } // namespace prerender |
OLD | NEW |