| Index: content/browser/devtools/devtools_manager_unittest.cc
|
| diff --git a/content/browser/devtools/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc
|
| index 8ef8cade13935a94fca9338385df8bb4a0454ba3..1da4418cbdaa148d5c4748478caa5497be05e097 100644
|
| --- a/content/browser/devtools/devtools_manager_unittest.cc
|
| +++ b/content/browser/devtools/devtools_manager_unittest.cc
|
| @@ -160,9 +160,9 @@ TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) {
|
| // Navigate to URL. First URL should use first RenderViewHost.
|
| const GURL url("http://www.google.com");
|
| controller().LoadURL(
|
| - url, Referrer(), PAGE_TRANSITION_TYPED, std::string());
|
| + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
|
| contents()->TestDidNavigate(
|
| - contents()->GetMainFrame(), 1, url, PAGE_TRANSITION_TYPED);
|
| + contents()->GetMainFrame(), 1, url, ui::PAGE_TRANSITION_TYPED);
|
| EXPECT_FALSE(contents()->cross_navigation_pending());
|
|
|
| TestDevToolsClientHost client_host;
|
| @@ -172,16 +172,16 @@ TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) {
|
| // Navigate to new site which should get a new RenderViewHost.
|
| const GURL url2("http://www.yahoo.com");
|
| controller().LoadURL(
|
| - url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());
|
| + url2, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
|
| EXPECT_TRUE(contents()->cross_navigation_pending());
|
| EXPECT_EQ(client_host.agent_host(),
|
| DevToolsAgentHost::GetOrCreateFor(web_contents()).get());
|
|
|
| // Interrupt pending navigation and navigate back to the original site.
|
| controller().LoadURL(
|
| - url, Referrer(), PAGE_TRANSITION_TYPED, std::string());
|
| + url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
|
| contents()->TestDidNavigate(
|
| - contents()->GetMainFrame(), 1, url, PAGE_TRANSITION_TYPED);
|
| + contents()->GetMainFrame(), 1, url, ui::PAGE_TRANSITION_TYPED);
|
| EXPECT_FALSE(contents()->cross_navigation_pending());
|
| EXPECT_EQ(client_host.agent_host(),
|
| DevToolsAgentHost::GetOrCreateFor(web_contents()).get());
|
|
|