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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
6 #include "base/time.h" | 6 #include "base/time.h" |
7 #include "content/browser/devtools/devtools_manager_impl.h" | 7 #include "content/browser/devtools/devtools_manager_impl.h" |
8 #include "content/browser/devtools/render_view_devtools_agent_host.h" | 8 #include "content/browser/devtools/render_view_devtools_agent_host.h" |
9 #include "content/browser/renderer_host/test_render_view_host.h" | 9 #include "content/browser/renderer_host/test_render_view_host.h" |
10 #include "content/browser/web_contents/test_web_contents.h" | 10 #include "content/browser/web_contents/test_web_contents.h" |
(...skipping 20 matching lines...) Expand all Loading... |
31 virtual ~TestDevToolsClientHost() { | 31 virtual ~TestDevToolsClientHost() { |
32 EXPECT_TRUE(closed_); | 32 EXPECT_TRUE(closed_); |
33 } | 33 } |
34 | 34 |
35 virtual void Close(DevToolsManager* manager) { | 35 virtual void Close(DevToolsManager* manager) { |
36 EXPECT_FALSE(closed_); | 36 EXPECT_FALSE(closed_); |
37 close_counter++; | 37 close_counter++; |
38 manager->ClientHostClosing(this); | 38 manager->ClientHostClosing(this); |
39 closed_ = true; | 39 closed_ = true; |
40 } | 40 } |
41 virtual void InspectedContentsClosing() { | 41 virtual void InspectedContentsClosing() OVERRIDE { |
42 FAIL(); | 42 FAIL(); |
43 } | 43 } |
44 | 44 |
45 virtual void DispatchOnInspectorFrontend(const std::string& message) { | 45 virtual void DispatchOnInspectorFrontend( |
| 46 const std::string& message) OVERRIDE { |
46 last_sent_message = &message; | 47 last_sent_message = &message; |
47 } | 48 } |
48 | 49 |
49 virtual void ReplacedWithAnotherClient() { | 50 virtual void ReplacedWithAnotherClient() OVERRIDE { |
50 } | 51 } |
51 | 52 |
52 static void ResetCounters() { | 53 static void ResetCounters() { |
53 close_counter = 0; | 54 close_counter = 0; |
54 } | 55 } |
55 | 56 |
56 static int close_counter; | 57 static int close_counter; |
57 | 58 |
58 const std::string* last_sent_message; | 59 const std::string* last_sent_message; |
59 | 60 |
60 private: | 61 private: |
61 bool closed_; | 62 bool closed_; |
62 | 63 |
63 DISALLOW_COPY_AND_ASSIGN(TestDevToolsClientHost); | 64 DISALLOW_COPY_AND_ASSIGN(TestDevToolsClientHost); |
64 }; | 65 }; |
65 | 66 |
66 int TestDevToolsClientHost::close_counter = 0; | 67 int TestDevToolsClientHost::close_counter = 0; |
67 | 68 |
68 | 69 |
69 class TestWebContentsDelegate : public WebContentsDelegate { | 70 class TestWebContentsDelegate : public WebContentsDelegate { |
70 public: | 71 public: |
71 TestWebContentsDelegate() : renderer_unresponsive_received_(false) {} | 72 TestWebContentsDelegate() : renderer_unresponsive_received_(false) {} |
72 | 73 |
73 // Notification that the contents is hung. | 74 // Notification that the contents is hung. |
74 virtual void RendererUnresponsive(WebContents* source) { | 75 virtual void RendererUnresponsive(WebContents* source) OVERRIDE { |
75 renderer_unresponsive_received_ = true; | 76 renderer_unresponsive_received_ = true; |
76 } | 77 } |
77 | 78 |
78 bool renderer_unresponsive_received() const { | 79 bool renderer_unresponsive_received() const { |
79 return renderer_unresponsive_received_; | 80 return renderer_unresponsive_received_; |
80 } | 81 } |
81 | 82 |
82 private: | 83 private: |
83 bool renderer_unresponsive_received_; | 84 bool renderer_unresponsive_received_; |
84 }; | 85 }; |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 controller().LoadURL( | 228 controller().LoadURL( |
228 url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); | 229 url, Referrer(), PAGE_TRANSITION_TYPED, std::string()); |
229 contents()->TestDidNavigate(rvh(), 1, url, PAGE_TRANSITION_TYPED); | 230 contents()->TestDidNavigate(rvh(), 1, url, PAGE_TRANSITION_TYPED); |
230 EXPECT_FALSE(contents()->cross_navigation_pending()); | 231 EXPECT_FALSE(contents()->cross_navigation_pending()); |
231 EXPECT_EQ(&client_host, devtools_manager->GetDevToolsClientHostFor( | 232 EXPECT_EQ(&client_host, devtools_manager->GetDevToolsClientHostFor( |
232 DevToolsAgentHost::GetFor(rvh()))); | 233 DevToolsAgentHost::GetFor(rvh()))); |
233 client_host.Close(DevToolsManager::GetInstance()); | 234 client_host.Close(DevToolsManager::GetInstance()); |
234 } | 235 } |
235 | 236 |
236 } // namespace content | 237 } // namespace content |
OLD | NEW |