| OLD | NEW |
| 1 // Copyright (c) 2011 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/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" |
| 11 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
| 12 #include "chrome/browser/ui/browser_list.h" | 12 #include "chrome/browser/ui/browser_list.h" |
| 13 #include "chrome/browser/ui/browser_window.h" | 13 #include "chrome/browser/ui/browser_window.h" |
| 14 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 14 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
| 15 #include "chrome/common/chrome_switches.h" | 15 #include "chrome/common/chrome_switches.h" |
| 16 #include "chrome/common/extensions/extension.h" | 16 #include "chrome/common/extensions/extension.h" |
| 17 #include "chrome/common/extensions/extension_file_util.h" | 17 #include "chrome/common/extensions/extension_file_util.h" |
| 18 #include "chrome/common/string_ordinal.h" | 18 #include "chrome/common/string_ordinal.h" |
| 19 #include "chrome/test/base/ui_test_utils.h" | 19 #include "chrome/test/base/ui_test_utils.h" |
| 20 #include "content/browser/renderer_host/render_view_host.h" | 20 #include "content/browser/renderer_host/render_view_host.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/web_contents.h" | 24 #include "content/public/browser/web_contents.h" |
| 24 #include "content/test/test_navigation_observer.h" | 25 #include "content/test/test_navigation_observer.h" |
| 25 #include "net/base/mock_host_resolver.h" | 26 #include "net/base/mock_host_resolver.h" |
| 26 | 27 |
| 27 using content::NavigationController; | 28 using content::NavigationController; |
| 28 using content::WebContents; | 29 using content::WebContents; |
| 29 | 30 |
| 30 class AppApiTest : public ExtensionApiTest { | 31 class AppApiTest : public ExtensionApiTest { |
| 31 protected: | 32 protected: |
| 32 // Gets the base URL for files for a specific test, making sure that it uses | 33 // Gets the base URL for files for a specific test, making sure that it uses |
| (...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 659 &browser()->GetSelectedTabContentsWrapper()->web_contents()-> | 660 &browser()->GetSelectedTabContentsWrapper()->web_contents()-> |
| 660 GetController())); | 661 GetController())); |
| 661 browser()->Reload(CURRENT_TAB); | 662 browser()->Reload(CURRENT_TAB); |
| 662 observer.Wait(); | 663 observer.Wait(); |
| 663 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( | 664 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( |
| 664 contents->GetRenderViewHost(), L"", | 665 contents->GetRenderViewHost(), L"", |
| 665 L"window.domAutomationController.send(chrome.app.isInstalled)", | 666 L"window.domAutomationController.send(chrome.app.isInstalled)", |
| 666 &is_installed)); | 667 &is_installed)); |
| 667 ASSERT_TRUE(is_installed); | 668 ASSERT_TRUE(is_installed); |
| 668 } | 669 } |
| OLD | NEW |