| 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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 EXPECT_EQ(host2->process(), | 320 EXPECT_EQ(host2->process(), |
| 321 browser()->GetTabContentsAt(2)->render_view_host()->process()); | 321 browser()->GetTabContentsAt(2)->render_view_host()->process()); |
| 322 } | 322 } |
| 323 | 323 |
| 324 // Tests that app process switching works properly in the following scenario: | 324 // Tests that app process switching works properly in the following scenario: |
| 325 // 1. navigate to a page1 in the app | 325 // 1. navigate to a page1 in the app |
| 326 // 2. page1 redirects to a page2 outside the app extent (ie, "/server-redirect") | 326 // 2. page1 redirects to a page2 outside the app extent (ie, "/server-redirect") |
| 327 // 3. page2 redirects back to a page in the app | 327 // 3. page2 redirects back to a page in the app |
| 328 // The final navigation should end up in the app process. | 328 // The final navigation should end up in the app process. |
| 329 // See http://crbug.com/61757 | 329 // See http://crbug.com/61757 |
| 330 IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcessRedirectBack) { | 330 // This test occasionally timeout on aura. See crbug.com/105957. |
| 331 #if defined(USE_AURA) |
| 332 #define MAYBE_AppProcessRedirectBack DISABLED_AppProcessRedirectBack |
| 333 #else |
| 334 #define MAYBE_AppProcessRedirectBack AppProcessRedirectBack |
| 335 #endif |
| 336 IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_AppProcessRedirectBack) { |
| 331 CommandLine::ForCurrentProcess()->AppendSwitch( | 337 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 332 switches::kDisablePopupBlocking); | 338 switches::kDisablePopupBlocking); |
| 333 | 339 |
| 334 host_resolver()->AddRule("*", "127.0.0.1"); | 340 host_resolver()->AddRule("*", "127.0.0.1"); |
| 335 ASSERT_TRUE(test_server()->Start()); | 341 ASSERT_TRUE(test_server()->Start()); |
| 336 | 342 |
| 337 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app_process"))); | 343 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app_process"))); |
| 338 | 344 |
| 339 // Open two tabs in the app. | 345 // Open two tabs in the app. |
| 340 GURL base_url = GetTestBaseURL("app_process"); | 346 GURL base_url = GetTestBaseURL("app_process"); |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 584 content::Source<NavigationController>( | 590 content::Source<NavigationController>( |
| 585 &browser()->GetSelectedTabContentsWrapper()->controller())); | 591 &browser()->GetSelectedTabContentsWrapper()->controller())); |
| 586 browser()->Reload(CURRENT_TAB); | 592 browser()->Reload(CURRENT_TAB); |
| 587 observer.Wait(); | 593 observer.Wait(); |
| 588 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( | 594 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( |
| 589 contents->render_view_host(), L"", | 595 contents->render_view_host(), L"", |
| 590 L"window.domAutomationController.send(chrome.app.isInstalled)", | 596 L"window.domAutomationController.send(chrome.app.isInstalled)", |
| 591 &is_installed)); | 597 &is_installed)); |
| 592 ASSERT_TRUE(is_installed); | 598 ASSERT_TRUE(is_installed); |
| 593 } | 599 } |
| OLD | NEW |