Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(686)

Side by Side Diff: headless/lib/headless_devtools_client_browsertest.cc

Issue 2140533003: DevTools: rename initialUrl to url in the Browser.createTarget protocol method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: headless test fixed Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/test/browser_test.h" 8 #include "content/public/test/browser_test.h"
9 #include "headless/public/domains/browser.h" 9 #include "headless/public/domains/browser.h"
10 #include "headless/public/domains/network.h" 10 #include "headless/public/domains/network.h"
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 176
177 class BrowserDomainCreateAndDeletePageTest 177 class BrowserDomainCreateAndDeletePageTest
178 : public HeadlessAsyncDevTooledBrowserTest { 178 : public HeadlessAsyncDevTooledBrowserTest {
179 void RunDevTooledTest() override { 179 void RunDevTooledTest() override {
180 EXPECT_TRUE(embedded_test_server()->Start()); 180 EXPECT_TRUE(embedded_test_server()->Start());
181 181
182 EXPECT_EQ(1u, browser()->GetAllWebContents().size()); 182 EXPECT_EQ(1u, browser()->GetAllWebContents().size());
183 183
184 devtools_client_->GetBrowser()->GetExperimental()->CreateTarget( 184 devtools_client_->GetBrowser()->GetExperimental()->CreateTarget(
185 browser::CreateTargetParams::Builder() 185 browser::CreateTargetParams::Builder()
186 .SetInitialUrl(embedded_test_server()->GetURL("/hello.html").spec()) 186 .SetUrl(embedded_test_server()->GetURL("/hello.html").spec())
187 .SetWidth(1) 187 .SetWidth(1)
188 .SetHeight(1) 188 .SetHeight(1)
189 .Build(), 189 .Build(),
190 base::Bind(&BrowserDomainCreateAndDeletePageTest::OnCreateTargetResult, 190 base::Bind(&BrowserDomainCreateAndDeletePageTest::OnCreateTargetResult,
191 base::Unretained(this))); 191 base::Unretained(this)));
192 } 192 }
193 193
194 void OnCreateTargetResult( 194 void OnCreateTargetResult(
195 std::unique_ptr<browser::CreateTargetResult> result) { 195 std::unique_ptr<browser::CreateTargetResult> result) {
196 EXPECT_EQ(2u, browser()->GetAllWebContents().size()); 196 EXPECT_EQ(2u, browser()->GetAllWebContents().size());
(...skipping 25 matching lines...) Expand all
222 base::Bind(&BrowserDomainDisposeContextFailsIfInUse::OnContextCreated, 222 base::Bind(&BrowserDomainDisposeContextFailsIfInUse::OnContextCreated,
223 base::Unretained(this))); 223 base::Unretained(this)));
224 } 224 }
225 225
226 void OnContextCreated( 226 void OnContextCreated(
227 std::unique_ptr<browser::CreateBrowserContextResult> result) { 227 std::unique_ptr<browser::CreateBrowserContextResult> result) {
228 context_id_ = result->GetBrowserContextId(); 228 context_id_ = result->GetBrowserContextId();
229 229
230 devtools_client_->GetBrowser()->GetExperimental()->CreateTarget( 230 devtools_client_->GetBrowser()->GetExperimental()->CreateTarget(
231 browser::CreateTargetParams::Builder() 231 browser::CreateTargetParams::Builder()
232 .SetInitialUrl(embedded_test_server()->GetURL("/hello.html").spec()) 232 .SetUrl(embedded_test_server()->GetURL("/hello.html").spec())
233 .SetBrowserContextId(context_id_) 233 .SetBrowserContextId(context_id_)
234 .Build(), 234 .Build(),
235 base::Bind( 235 base::Bind(
236 &BrowserDomainDisposeContextFailsIfInUse::OnCreateTargetResult, 236 &BrowserDomainDisposeContextFailsIfInUse::OnCreateTargetResult,
237 base::Unretained(this))); 237 base::Unretained(this)));
238 } 238 }
239 239
240 void OnCreateTargetResult( 240 void OnCreateTargetResult(
241 std::unique_ptr<browser::CreateTargetResult> result) { 241 std::unique_ptr<browser::CreateTargetResult> result) {
242 page_id_ = result->GetTargetId(); 242 page_id_ = result->GetTargetId();
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 context_id_two_ = result->GetBrowserContextId(); 316 context_id_two_ = result->GetBrowserContextId();
317 MaybeCreatePages(); 317 MaybeCreatePages();
318 } 318 }
319 319
320 void MaybeCreatePages() { 320 void MaybeCreatePages() {
321 if (context_id_one_.empty() || context_id_two_.empty()) 321 if (context_id_one_.empty() || context_id_two_.empty())
322 return; 322 return;
323 323
324 devtools_client_->GetBrowser()->GetExperimental()->CreateTarget( 324 devtools_client_->GetBrowser()->GetExperimental()->CreateTarget(
325 browser::CreateTargetParams::Builder() 325 browser::CreateTargetParams::Builder()
326 .SetInitialUrl(embedded_test_server()->GetURL("/hello.html").spec()) 326 .SetUrl(embedded_test_server()->GetURL("/hello.html").spec())
327 .SetBrowserContextId(context_id_one_) 327 .SetBrowserContextId(context_id_one_)
328 .Build(), 328 .Build(),
329 base::Bind(&BrowserDomainCreateTwoContexts::OnCreateTargetOneResult, 329 base::Bind(&BrowserDomainCreateTwoContexts::OnCreateTargetOneResult,
330 base::Unretained(this))); 330 base::Unretained(this)));
331 331
332 devtools_client_->GetBrowser()->GetExperimental()->CreateTarget( 332 devtools_client_->GetBrowser()->GetExperimental()->CreateTarget(
333 browser::CreateTargetParams::Builder() 333 browser::CreateTargetParams::Builder()
334 .SetInitialUrl(embedded_test_server()->GetURL("/hello.html").spec()) 334 .SetUrl(embedded_test_server()->GetURL("/hello.html").spec())
335 .SetBrowserContextId(context_id_two_) 335 .SetBrowserContextId(context_id_two_)
336 .Build(), 336 .Build(),
337 base::Bind(&BrowserDomainCreateTwoContexts::OnCreateTargetTwoResult, 337 base::Bind(&BrowserDomainCreateTwoContexts::OnCreateTargetTwoResult,
338 base::Unretained(this))); 338 base::Unretained(this)));
339 } 339 }
340 340
341 void OnCreateTargetOneResult( 341 void OnCreateTargetOneResult(
342 std::unique_ptr<browser::CreateTargetResult> result) { 342 std::unique_ptr<browser::CreateTargetResult> result) {
343 page_id_one_ = result->GetTargetId(); 343 page_id_one_ = result->GetTargetId();
344 MaybeTestIsolation(); 344 MaybeTestIsolation();
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 std::string page_id_two_; 488 std::string page_id_two_;
489 bool page_one_loaded_ = false; 489 bool page_one_loaded_ = false;
490 bool page_two_loaded_ = false; 490 bool page_two_loaded_ = false;
491 int page_close_count_ = 0; 491 int page_close_count_ = 0;
492 int context_closed_count_ = 0; 492 int context_closed_count_ = 0;
493 }; 493 };
494 494
495 HEADLESS_ASYNC_DEVTOOLED_TEST_F(BrowserDomainCreateTwoContexts); 495 HEADLESS_ASYNC_DEVTOOLED_TEST_F(BrowserDomainCreateTwoContexts);
496 496
497 } // namespace headless 497 } // namespace headless
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698