OLD | NEW |
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/command_line.h" | 5 #include "base/command_line.h" |
6 #include "build/build_config.h" | 6 #include "build/build_config.h" |
7 #include "chrome/browser/chrome_notification_types.h" | 7 #include "chrome/browser/chrome_notification_types.h" |
8 #include "chrome/browser/extensions/extension_apitest.h" | 8 #include "chrome/browser/extensions/extension_apitest.h" |
9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
11 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" | 11 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" |
12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
13 #include "chrome/browser/ui/browser_commands.h" | 13 #include "chrome/browser/ui/browser_commands.h" |
14 #include "chrome/browser/ui/browser_finder.h" | 14 #include "chrome/browser/ui/browser_finder.h" |
15 #include "chrome/browser/ui/browser_list.h" | 15 #include "chrome/browser/ui/browser_list.h" |
16 #include "chrome/browser/ui/browser_window.h" | 16 #include "chrome/browser/ui/browser_window.h" |
17 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 17 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
18 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
19 #include "chrome/test/base/ui_test_utils.h" | 19 #include "chrome/test/base/ui_test_utils.h" |
20 #include "components/sync/api/string_ordinal.h" | 20 #include "components/sync/model/string_ordinal.h" |
21 #include "content/public/browser/navigation_entry.h" | 21 #include "content/public/browser/navigation_entry.h" |
22 #include "content/public/browser/notification_service.h" | 22 #include "content/public/browser/notification_service.h" |
23 #include "content/public/browser/render_process_host.h" | 23 #include "content/public/browser/render_process_host.h" |
24 #include "content/public/browser/render_view_host.h" | 24 #include "content/public/browser/render_view_host.h" |
25 #include "content/public/browser/site_instance.h" | 25 #include "content/public/browser/site_instance.h" |
26 #include "content/public/browser/web_contents.h" | 26 #include "content/public/browser/web_contents.h" |
27 #include "content/public/test/browser_test_utils.h" | 27 #include "content/public/test/browser_test_utils.h" |
28 #include "content/public/test/test_navigation_observer.h" | 28 #include "content/public/test/test_navigation_observer.h" |
29 #include "extensions/browser/extension_host.h" | 29 #include "extensions/browser/extension_host.h" |
30 #include "extensions/browser/extension_system.h" | 30 #include "extensions/browser/extension_system.h" |
(...skipping 825 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
856 // Navigate the popup to another process outside the app. | 856 // Navigate the popup to another process outside the app. |
857 GURL non_app_url(base_url.Resolve("path3/empty.html")); | 857 GURL non_app_url(base_url.Resolve("path3/empty.html")); |
858 ui_test_utils::NavigateToURL(active_browser_list->get(1), non_app_url); | 858 ui_test_utils::NavigateToURL(active_browser_list->get(1), non_app_url); |
859 SiteInstance* new_instance = popup_contents->GetSiteInstance(); | 859 SiteInstance* new_instance = popup_contents->GetSiteInstance(); |
860 EXPECT_NE(app_instance, new_instance); | 860 EXPECT_NE(app_instance, new_instance); |
861 | 861 |
862 // It should still be in the same BrowsingInstance, allowing postMessage to | 862 // It should still be in the same BrowsingInstance, allowing postMessage to |
863 // work. | 863 // work. |
864 EXPECT_TRUE(app_instance->IsRelatedSiteInstance(new_instance)); | 864 EXPECT_TRUE(app_instance->IsRelatedSiteInstance(new_instance)); |
865 } | 865 } |
OLD | NEW |