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 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "base/stringprintf.h" | 10 #include "base/stringprintf.h" |
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
444 | 444 |
445 private: | 445 private: |
446 FakeSafeBrowsingService* most_recent_service_; | 446 FakeSafeBrowsingService* most_recent_service_; |
447 }; | 447 }; |
448 #endif | 448 #endif |
449 | 449 |
450 class FakeDevToolsClientHost : public DevToolsClientHost { | 450 class FakeDevToolsClientHost : public DevToolsClientHost { |
451 public: | 451 public: |
452 FakeDevToolsClientHost() {} | 452 FakeDevToolsClientHost() {} |
453 virtual ~FakeDevToolsClientHost() {} | 453 virtual ~FakeDevToolsClientHost() {} |
454 virtual void InspectedTabClosing() OVERRIDE {} | 454 virtual void InspectedContentsClosing() OVERRIDE {} |
455 virtual void FrameNavigating(const std::string& url) OVERRIDE {} | 455 virtual void FrameNavigating(const std::string& url) OVERRIDE {} |
456 virtual void DispatchOnInspectorFrontend(const std::string& msg) OVERRIDE {} | 456 virtual void DispatchOnInspectorFrontend(const std::string& msg) OVERRIDE {} |
457 virtual void TabReplaced(WebContents* new_tab) OVERRIDE {} | 457 virtual void ContentsReplaced(WebContents* new_contents) OVERRIDE {} |
458 }; | 458 }; |
459 | 459 |
460 class RestorePrerenderMode { | 460 class RestorePrerenderMode { |
461 public: | 461 public: |
462 RestorePrerenderMode() : prev_mode_(PrerenderManager::GetMode()) { | 462 RestorePrerenderMode() : prev_mode_(PrerenderManager::GetMode()) { |
463 } | 463 } |
464 | 464 |
465 ~RestorePrerenderMode() { PrerenderManager::SetMode(prev_mode_); } | 465 ~RestorePrerenderMode() { PrerenderManager::SetMode(prev_mode_); } |
466 private: | 466 private: |
467 PrerenderManager::PrerenderManagerMode prev_mode_; | 467 PrerenderManager::PrerenderManagerMode prev_mode_; |
(...skipping 1679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2147 WebContents* web_contents = browser()->GetSelectedWebContents(); | 2147 WebContents* web_contents = browser()->GetSelectedWebContents(); |
2148 bool display_test_result = false; | 2148 bool display_test_result = false; |
2149 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( | 2149 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( |
2150 web_contents->GetRenderViewHost(), L"", | 2150 web_contents->GetRenderViewHost(), L"", |
2151 L"DidDisplayReallyPass()", | 2151 L"DidDisplayReallyPass()", |
2152 &display_test_result)); | 2152 &display_test_result)); |
2153 ASSERT_TRUE(display_test_result); | 2153 ASSERT_TRUE(display_test_result); |
2154 } | 2154 } |
2155 | 2155 |
2156 } // namespace prerender | 2156 } // namespace prerender |
OLD | NEW |