| 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 "chrome/browser/chrome_notification_types.h" | 6 #include "chrome/browser/chrome_notification_types.h" |
| 7 #include "chrome/browser/extensions/extension_apitest.h" | 7 #include "chrome/browser/extensions/extension_apitest.h" |
| 8 #include "chrome/browser/extensions/extension_host.h" | 8 #include "chrome/browser/extensions/extension_host.h" |
| 9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
| 10 #include "chrome/browser/extensions/extension_system.h" | 10 #include "chrome/browser/extensions/extension_system.h" |
| 11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" | 12 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" |
| 13 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
| 14 #include "chrome/browser/ui/browser_commands.h" | 14 #include "chrome/browser/ui/browser_commands.h" |
| 15 #include "chrome/browser/ui/browser_finder.h" | 15 #include "chrome/browser/ui/browser_finder.h" |
| 16 #include "chrome/browser/ui/browser_list.h" | 16 #include "chrome/browser/ui/browser_list.h" |
| 17 #include "chrome/browser/ui/browser_window.h" | 17 #include "chrome/browser/ui/browser_window.h" |
| 18 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 18 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 19 #include "chrome/common/chrome_switches.h" | 19 #include "chrome/common/chrome_switches.h" |
| 20 #include "chrome/common/extensions/extension.h" | |
| 21 #include "chrome/common/extensions/extension_file_util.h" | 20 #include "chrome/common/extensions/extension_file_util.h" |
| 22 #include "chrome/test/base/test_switches.h" | 21 #include "chrome/test/base/test_switches.h" |
| 23 #include "chrome/test/base/ui_test_utils.h" | 22 #include "chrome/test/base/ui_test_utils.h" |
| 24 #include "content/public/browser/navigation_entry.h" | 23 #include "content/public/browser/navigation_entry.h" |
| 25 #include "content/public/browser/notification_service.h" | 24 #include "content/public/browser/notification_service.h" |
| 26 #include "content/public/browser/render_process_host.h" | 25 #include "content/public/browser/render_process_host.h" |
| 27 #include "content/public/browser/render_view_host.h" | 26 #include "content/public/browser/render_view_host.h" |
| 28 #include "content/public/browser/web_contents.h" | 27 #include "content/public/browser/web_contents.h" |
| 29 #include "content/public/test/browser_test_utils.h" | 28 #include "content/public/test/browser_test_utils.h" |
| 30 #include "content/public/test/test_navigation_observer.h" | 29 #include "content/public/test/test_navigation_observer.h" |
| 31 #include "extensions/browser/process_map.h" | 30 #include "extensions/browser/process_map.h" |
| 31 #include "extensions/common/extension.h" |
| 32 #include "extensions/common/switches.h" | 32 #include "extensions/common/switches.h" |
| 33 #include "net/dns/mock_host_resolver.h" | 33 #include "net/dns/mock_host_resolver.h" |
| 34 #include "net/test/embedded_test_server/embedded_test_server.h" | 34 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 35 #include "sync/api/string_ordinal.h" | 35 #include "sync/api/string_ordinal.h" |
| 36 | 36 |
| 37 using content::NavigationController; | 37 using content::NavigationController; |
| 38 using content::RenderViewHost; | 38 using content::RenderViewHost; |
| 39 using content::WebContents; | 39 using content::WebContents; |
| 40 using extensions::Extension; | 40 using extensions::Extension; |
| 41 | 41 |
| (...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 825 &browser()->tab_strip_model()->GetActiveWebContents()-> | 825 &browser()->tab_strip_model()->GetActiveWebContents()-> |
| 826 GetController())); | 826 GetController())); |
| 827 chrome::Reload(browser(), CURRENT_TAB); | 827 chrome::Reload(browser(), CURRENT_TAB); |
| 828 observer.Wait(); | 828 observer.Wait(); |
| 829 ASSERT_TRUE(content::ExecuteScriptAndExtractBool( | 829 ASSERT_TRUE(content::ExecuteScriptAndExtractBool( |
| 830 contents, | 830 contents, |
| 831 "window.domAutomationController.send(chrome.app.isInstalled)", | 831 "window.domAutomationController.send(chrome.app.isInstalled)", |
| 832 &is_installed)); | 832 &is_installed)); |
| 833 ASSERT_TRUE(is_installed); | 833 ASSERT_TRUE(is_installed); |
| 834 } | 834 } |
| OLD | NEW |