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

Side by Side Diff: content/browser/devtools/devtools_manager_unittest.cc

Issue 1048463004: PlzNavigate: track pending commits (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed other occurences of main_test_rfh Created 5 years, 8 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 (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/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/time/time.h" 7 #include "base/time/time.h"
8 #include "content/browser/devtools/devtools_manager.h" 8 #include "content/browser/devtools/devtools_manager.h"
9 #include "content/browser/devtools/shared_worker_devtools_manager.h" 9 #include "content/browser/devtools/shared_worker_devtools_manager.h"
10 #include "content/browser/shared_worker/shared_worker_instance.h" 10 #include "content/browser/shared_worker/shared_worker_instance.h"
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 } 272 }
273 273
274 TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) { 274 TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) {
275 // Navigate to URL. First URL should use first RenderViewHost. 275 // Navigate to URL. First URL should use first RenderViewHost.
276 const GURL url("http://www.google.com"); 276 const GURL url("http://www.google.com");
277 controller().LoadURL( 277 controller().LoadURL(
278 url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); 278 url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
279 contents()->GetMainFrame()->PrepareForCommit(); 279 contents()->GetMainFrame()->PrepareForCommit();
280 contents()->TestDidNavigate( 280 contents()->TestDidNavigate(
281 contents()->GetMainFrame(), 1, url, ui::PAGE_TRANSITION_TYPED); 281 contents()->GetMainFrame(), 1, url, ui::PAGE_TRANSITION_TYPED);
282 EXPECT_FALSE(contents()->cross_navigation_pending()); 282 EXPECT_FALSE(contents()->CrossProcessNavigationPending());
283 283
284 TestDevToolsClientHost client_host; 284 TestDevToolsClientHost client_host;
285 client_host.InspectAgentHost( 285 client_host.InspectAgentHost(
286 DevToolsAgentHost::GetOrCreateFor(web_contents()).get()); 286 DevToolsAgentHost::GetOrCreateFor(web_contents()).get());
287 287
288 // Navigate to new site which should get a new RenderViewHost. 288 // Navigate to new site which should get a new RenderViewHost.
289 const GURL url2("http://www.yahoo.com"); 289 const GURL url2("http://www.yahoo.com");
290 controller().LoadURL( 290 controller().LoadURL(
291 url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); 291 url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
292 contents()->GetMainFrame()->PrepareForCommit(); 292 contents()->GetMainFrame()->PrepareForCommit();
293 EXPECT_TRUE(contents()->cross_navigation_pending()); 293 EXPECT_TRUE(contents()->CrossProcessNavigationPending());
294 EXPECT_EQ(client_host.agent_host(), 294 EXPECT_EQ(client_host.agent_host(),
295 DevToolsAgentHost::GetOrCreateFor(web_contents()).get()); 295 DevToolsAgentHost::GetOrCreateFor(web_contents()).get());
296 296
297 // Interrupt pending navigation and navigate back to the original site. 297 // Interrupt pending navigation and navigate back to the original site.
298 controller().LoadURL( 298 controller().LoadURL(
299 url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string()); 299 url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
300 contents()->GetMainFrame()->PrepareForCommit(); 300 contents()->GetMainFrame()->PrepareForCommit();
301 contents()->TestDidNavigate( 301 contents()->TestDidNavigate(
302 contents()->GetMainFrame(), 1, url, ui::PAGE_TRANSITION_TYPED); 302 contents()->GetMainFrame(), 1, url, ui::PAGE_TRANSITION_TYPED);
303 EXPECT_FALSE(contents()->cross_navigation_pending()); 303 EXPECT_FALSE(contents()->CrossProcessNavigationPending());
304 EXPECT_EQ(client_host.agent_host(), 304 EXPECT_EQ(client_host.agent_host(),
305 DevToolsAgentHost::GetOrCreateFor(web_contents()).get()); 305 DevToolsAgentHost::GetOrCreateFor(web_contents()).get());
306 client_host.Close(); 306 client_host.Close();
307 } 307 }
308 308
309 class TestExternalAgentDelegate: public DevToolsExternalAgentProxyDelegate { 309 class TestExternalAgentDelegate: public DevToolsExternalAgentProxyDelegate {
310 std::map<std::string,int> event_counter_; 310 std::map<std::string,int> event_counter_;
311 311
312 void recordEvent(const std::string& name) { 312 void recordEvent(const std::string& name) {
313 if (event_counter_.find(name) == event_counter_.end()) 313 if (event_counter_.find(name) == event_counter_.end())
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 scheduler.Run(); 454 scheduler.Run();
455 EXPECT_TRUE(scheduler.IsEmpty()); 455 EXPECT_TRUE(scheduler.IsEmpty());
456 EXPECT_EQ(4, observer->updates_count()); 456 EXPECT_EQ(4, observer->updates_count());
457 457
458 manager->RemoveObserver(observer.get()); 458 manager->RemoveObserver(observer.get());
459 459
460 EXPECT_TRUE(scheduler.IsEmpty()); 460 EXPECT_TRUE(scheduler.IsEmpty());
461 } 461 }
462 462
463 } // namespace content 463 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698