| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 <memory> | 5 #include <memory> |
| 6 | 6 |
| 7 #include "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
| 8 #include "content/public/browser/render_widget_host_view.h" | 8 #include "content/public/browser/render_widget_host_view.h" |
| 9 #include "content/public/browser/web_contents.h" | 9 #include "content/public/browser/web_contents.h" |
| 10 #include "content/public/test/browser_test.h" | 10 #include "content/public/test/browser_test.h" |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 void RunDevTooledTest() override { | 185 void RunDevTooledTest() override { |
| 186 EXPECT_TRUE(embedded_test_server()->Start()); | 186 EXPECT_TRUE(embedded_test_server()->Start()); |
| 187 // Check that experimental commands require parameter objects. | 187 // Check that experimental commands require parameter objects. |
| 188 devtools_client_->GetRuntime() | 188 devtools_client_->GetRuntime() |
| 189 ->GetExperimental() | 189 ->GetExperimental() |
| 190 ->SetCustomObjectFormatterEnabled( | 190 ->SetCustomObjectFormatterEnabled( |
| 191 runtime::SetCustomObjectFormatterEnabledParams::Builder() | 191 runtime::SetCustomObjectFormatterEnabledParams::Builder() |
| 192 .SetEnabled(false) | 192 .SetEnabled(false) |
| 193 .Build()); | 193 .Build()); |
| 194 | 194 |
| 195 // Check that a previously experimental command which takes no parameters |
| 196 // still works by giving it a parameter object. |
| 197 devtools_client_->GetRuntime()->GetExperimental()->RunIfWaitingForDebugger( |
| 198 runtime::RunIfWaitingForDebuggerParams::Builder().Build()); |
| 199 |
| 195 devtools_client_->GetPage()->GetExperimental()->AddObserver(this); | 200 devtools_client_->GetPage()->GetExperimental()->AddObserver(this); |
| 196 devtools_client_->GetPage()->Enable(); | 201 devtools_client_->GetPage()->Enable(); |
| 197 devtools_client_->GetPage()->Navigate( | 202 devtools_client_->GetPage()->Navigate( |
| 198 embedded_test_server()->GetURL("/hello.html").spec()); | 203 embedded_test_server()->GetURL("/hello.html").spec()); |
| 199 } | 204 } |
| 200 | 205 |
| 201 void OnFrameStoppedLoading( | 206 void OnFrameStoppedLoading( |
| 202 const page::FrameStoppedLoadingParams& params) override { | 207 const page::FrameStoppedLoadingParams& params) override { |
| 203 FinishAsynchronousTest(); | 208 // Check that a non-experimental command which has no return value can be |
| 209 // called with a void() callback. |
| 210 devtools_client_->GetPage()->Reload( |
| 211 page::ReloadParams::Builder().Build(), |
| 212 base::Bind(&HeadlessDevToolsClientExperimentalTest::OnReloadStarted, |
| 213 base::Unretained(this))); |
| 204 } | 214 } |
| 215 |
| 216 void OnReloadStarted() { FinishAsynchronousTest(); } |
| 205 }; | 217 }; |
| 206 | 218 |
| 207 HEADLESS_ASYNC_DEVTOOLED_TEST_F(HeadlessDevToolsClientExperimentalTest); | 219 HEADLESS_ASYNC_DEVTOOLED_TEST_F(HeadlessDevToolsClientExperimentalTest); |
| 208 | 220 |
| 209 class BrowserDomainCreateAndDeletePageTest | 221 class BrowserDomainCreateAndDeletePageTest |
| 210 : public HeadlessAsyncDevTooledBrowserTest { | 222 : public HeadlessAsyncDevTooledBrowserTest { |
| 211 void RunDevTooledTest() override { | 223 void RunDevTooledTest() override { |
| 212 EXPECT_TRUE(embedded_test_server()->Start()); | 224 EXPECT_TRUE(embedded_test_server()->Start()); |
| 213 | 225 |
| 214 EXPECT_EQ(1u, GetAllWebContents(browser()).size()); | 226 EXPECT_EQ(1u, GetAllWebContents(browser()).size()); |
| (...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 635 FinishAsynchronousTest(); | 647 FinishAsynchronousTest(); |
| 636 } | 648 } |
| 637 | 649 |
| 638 private: | 650 private: |
| 639 bool navigation_requested_ = false; | 651 bool navigation_requested_ = false; |
| 640 }; | 652 }; |
| 641 | 653 |
| 642 HEADLESS_ASYNC_DEVTOOLED_TEST_F(HeadlessDevToolsNavigationControlTest); | 654 HEADLESS_ASYNC_DEVTOOLED_TEST_F(HeadlessDevToolsNavigationControlTest); |
| 643 | 655 |
| 644 } // namespace headless | 656 } // namespace headless |
| OLD | NEW |