OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/utf_string_conversions.h" | 5 #include "base/utf_string_conversions.h" |
6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
7 #include "chrome/browser/extensions/extension_host.h" | 7 #include "chrome/browser/extensions/extension_host.h" |
8 #include "chrome/browser/extensions/extension_service.h" | 8 #include "chrome/browser/extensions/extension_service.h" |
9 #include "chrome/browser/extensions/process_map.h" | 9 #include "chrome/browser/extensions/process_map.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
354 // 3. Renderer issues the meta refresh to navigate to server-redirect. | 354 // 3. Renderer issues the meta refresh to navigate to server-redirect. |
355 // 4. Renderer is now in a "provisional load", waiting for navigation to | 355 // 4. Renderer is now in a "provisional load", waiting for navigation to |
356 // complete. | 356 // complete. |
357 // 5. Browser sees a redirect response from server-redirect to empty.html, and | 357 // 5. Browser sees a redirect response from server-redirect to empty.html, and |
358 // transfers that to a new navigation, using RequestTransferURL. | 358 // transfers that to a new navigation, using RequestTransferURL. |
359 // 6. We navigate to empty.html. | 359 // 6. We navigate to empty.html. |
360 // 7. Renderer is still in a provisional load to server-redirect, so that is | 360 // 7. Renderer is still in a provisional load to server-redirect, so that is |
361 // cancelled, and counts as a load stop | 361 // cancelled, and counts as a load stop |
362 // 8. Renderer navigates to empty.html, and finishes loading, counting as the | 362 // 8. Renderer navigates to empty.html, and finishes loading, counting as the |
363 // third load stop | 363 // third load stop |
364 #if defined(TRANSFER_REDIRECTS_BUG79520) | |
365 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( | 364 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( |
366 browser(), base_url.Resolve("path1/redirect.html"), 3); | 365 browser(), base_url.Resolve("path1/redirect.html"), 3); |
367 #else | |
368 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( | |
369 browser(), base_url.Resolve("path1/redirect.html"), 2); | |
370 #endif | |
371 | 366 |
372 // 3 tabs, including the initial about:blank. The last 2 should be the same | 367 // 3 tabs, including the initial about:blank. The last 2 should be the same |
373 // process. | 368 // process. |
374 ASSERT_EQ(3, browser()->tab_count()); | 369 ASSERT_EQ(3, browser()->tab_count()); |
375 EXPECT_EQ("/files/extensions/api_test/app_process/path1/empty.html", | 370 EXPECT_EQ("/files/extensions/api_test/app_process/path1/empty.html", |
376 browser()->GetTabContentsAt(2)->controller(). | 371 browser()->GetTabContentsAt(2)->controller(). |
377 GetLastCommittedEntry()->url().path()); | 372 GetLastCommittedEntry()->url().path()); |
378 EXPECT_EQ(browser()->GetTabContentsAt(1)->render_view_host()->process(), | 373 EXPECT_EQ(browser()->GetTabContentsAt(1)->render_view_host()->process(), |
379 browser()->GetTabContentsAt(2)->render_view_host()->process()); | 374 browser()->GetTabContentsAt(2)->render_view_host()->process()); |
380 } | 375 } |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
606 content::Source<NavigationController>( | 601 content::Source<NavigationController>( |
607 &browser()->GetSelectedTabContentsWrapper()->controller())); | 602 &browser()->GetSelectedTabContentsWrapper()->controller())); |
608 browser()->Reload(CURRENT_TAB); | 603 browser()->Reload(CURRENT_TAB); |
609 observer.Wait(); | 604 observer.Wait(); |
610 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( | 605 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( |
611 contents->render_view_host(), L"", | 606 contents->render_view_host(), L"", |
612 L"window.domAutomationController.send(chrome.app.isInstalled)", | 607 L"window.domAutomationController.send(chrome.app.isInstalled)", |
613 &is_installed)); | 608 &is_installed)); |
614 ASSERT_TRUE(is_installed); | 609 ASSERT_TRUE(is_installed); |
615 } | 610 } |
OLD | NEW |