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 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
556 #endif | 556 #endif |
557 | 557 |
558 class FakeDevToolsClientHost : public DevToolsClientHost { | 558 class FakeDevToolsClientHost : public DevToolsClientHost { |
559 public: | 559 public: |
560 FakeDevToolsClientHost() {} | 560 FakeDevToolsClientHost() {} |
561 virtual ~FakeDevToolsClientHost() {} | 561 virtual ~FakeDevToolsClientHost() {} |
562 virtual void InspectedContentsClosing() OVERRIDE {} | 562 virtual void InspectedContentsClosing() OVERRIDE {} |
563 virtual void FrameNavigating(const std::string& url) OVERRIDE {} | 563 virtual void FrameNavigating(const std::string& url) OVERRIDE {} |
564 virtual void DispatchOnInspectorFrontend(const std::string& msg) OVERRIDE {} | 564 virtual void DispatchOnInspectorFrontend(const std::string& msg) OVERRIDE {} |
565 virtual void ContentsReplaced(WebContents* new_contents) OVERRIDE {} | 565 virtual void ContentsReplaced(WebContents* new_contents) OVERRIDE {} |
| 566 virtual void ReplacedWithAnotherClient() OVERRIDE {} |
566 }; | 567 }; |
567 | 568 |
568 class RestorePrerenderMode { | 569 class RestorePrerenderMode { |
569 public: | 570 public: |
570 RestorePrerenderMode() : prev_mode_(PrerenderManager::GetMode()) { | 571 RestorePrerenderMode() : prev_mode_(PrerenderManager::GetMode()) { |
571 } | 572 } |
572 | 573 |
573 ~RestorePrerenderMode() { PrerenderManager::SetMode(prev_mode_); } | 574 ~RestorePrerenderMode() { PrerenderManager::SetMode(prev_mode_); } |
574 private: | 575 private: |
575 PrerenderManager::PrerenderManagerMode prev_mode_; | 576 PrerenderManager::PrerenderManagerMode prev_mode_; |
(...skipping 1943 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2519 channel_close_watcher.WatchChannel( | 2520 channel_close_watcher.WatchChannel( |
2520 chrome::GetActiveWebContents(browser())->GetRenderProcessHost()); | 2521 chrome::GetActiveWebContents(browser())->GetRenderProcessHost()); |
2521 NavigateToDestURL(); | 2522 NavigateToDestURL(); |
2522 channel_close_watcher.WaitForChannelClose(); | 2523 channel_close_watcher.WaitForChannelClose(); |
2523 | 2524 |
2524 ASSERT_TRUE(IsEmptyPrerenderLinkManager()); | 2525 ASSERT_TRUE(IsEmptyPrerenderLinkManager()); |
2525 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 2526 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
2526 } | 2527 } |
2527 | 2528 |
2528 } // namespace prerender | 2529 } // namespace prerender |
OLD | NEW |