| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/strings/stringprintf.h" | 5 #include "base/strings/stringprintf.h" |
| 6 #include "chrome/browser/apps/app_browsertest_util.h" | 6 #include "chrome/browser/apps/app_browsertest_util.h" |
| 7 #include "chrome/test/base/ui_test_utils.h" | 7 #include "chrome/test/base/ui_test_utils.h" |
| 8 #include "components/guest_view/browser/guest_view_manager.h" |
| 9 #include "components/guest_view/browser/guest_view_manager_factory.h" |
| 10 #include "components/guest_view/browser/test_guest_view_manager.h" |
| 8 #include "content/public/test/browser_test_utils.h" | 11 #include "content/public/test/browser_test_utils.h" |
| 9 #include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h
" | 12 #include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h
" |
| 10 #include "extensions/browser/guest_view/guest_view_manager.h" | |
| 11 #include "extensions/browser/guest_view/guest_view_manager_factory.h" | |
| 12 #include "extensions/browser/guest_view/test_guest_view_manager.h" | |
| 13 #include "extensions/test/extension_test_message_listener.h" | 13 #include "extensions/test/extension_test_message_listener.h" |
| 14 | 14 |
| 15 using extensions::ExtensionsGuestViewManagerDelegate; | 15 using extensions::ExtensionsGuestViewManagerDelegate; |
| 16 using extensions::GuestViewManager; | 16 using guestview::GuestViewManager; |
| 17 using extensions::TestGuestViewManager; | 17 using guestview::TestGuestViewManager; |
| 18 using guestview::TestGuestViewManagerFactory; |
| 18 | 19 |
| 19 class ExtensionViewTest : public extensions::PlatformAppBrowserTest { | 20 class ExtensionViewTest : public extensions::PlatformAppBrowserTest { |
| 20 public: | 21 public: |
| 21 ExtensionViewTest() { | 22 ExtensionViewTest() { |
| 22 extensions::GuestViewManager::set_factory_for_testing(&factory_); | 23 GuestViewManager::set_factory_for_testing(&factory_); |
| 23 } | 24 } |
| 24 | 25 |
| 25 extensions::TestGuestViewManager* GetGuestViewManager() { | 26 TestGuestViewManager* GetGuestViewManager() { |
| 26 TestGuestViewManager* manager = static_cast<TestGuestViewManager*>( | 27 TestGuestViewManager* manager = static_cast<TestGuestViewManager*>( |
| 27 TestGuestViewManager::FromBrowserContext(browser()->profile())); | 28 TestGuestViewManager::FromBrowserContext(browser()->profile())); |
| 28 // TestGuestViewManager::WaitForSingleGuestCreated may and will get called | 29 // TestGuestViewManager::WaitForSingleGuestCreated may and will get called |
| 29 // before a guest is created. | 30 // before a guest is created. |
| 30 if (!manager) { | 31 if (!manager) { |
| 31 manager = static_cast<TestGuestViewManager*>( | 32 manager = static_cast<TestGuestViewManager*>( |
| 32 GuestViewManager::CreateWithDelegate( | 33 GuestViewManager::CreateWithDelegate( |
| 33 browser()->profile(), | 34 browser()->profile(), |
| 34 scoped_ptr<guestview::GuestViewManagerDelegate>( | 35 scoped_ptr<guestview::GuestViewManagerDelegate>( |
| 35 new ExtensionsGuestViewManagerDelegate( | 36 new ExtensionsGuestViewManagerDelegate( |
| (...skipping 27 matching lines...) Expand all Loading... |
| 63 return; | 64 return; |
| 64 } | 65 } |
| 65 ASSERT_TRUE(done_listener.WaitUntilSatisfied()); | 66 ASSERT_TRUE(done_listener.WaitUntilSatisfied()); |
| 66 } | 67 } |
| 67 | 68 |
| 68 private: | 69 private: |
| 69 void SetUpCommandLine(base::CommandLine* command_line) override { | 70 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 70 extensions::PlatformAppBrowserTest::SetUpCommandLine(command_line); | 71 extensions::PlatformAppBrowserTest::SetUpCommandLine(command_line); |
| 71 } | 72 } |
| 72 | 73 |
| 73 extensions::TestGuestViewManagerFactory factory_; | 74 TestGuestViewManagerFactory factory_; |
| 74 }; | 75 }; |
| 75 | 76 |
| 76 // Tests that <extensionview> can be created and added to the DOM. | 77 // Tests that <extensionview> can be created and added to the DOM. |
| 77 IN_PROC_BROWSER_TEST_F(ExtensionViewTest, | 78 IN_PROC_BROWSER_TEST_F(ExtensionViewTest, |
| 78 TestExtensionViewCreationShouldSucceed) { | 79 TestExtensionViewCreationShouldSucceed) { |
| 79 const extensions::Extension* skeleton_app = | 80 const extensions::Extension* skeleton_app = |
| 80 InstallPlatformApp("extension_view/skeleton"); | 81 InstallPlatformApp("extension_view/skeleton"); |
| 81 TestHelper("testExtensionViewCreationShouldSucceed", "extension_view", | 82 TestHelper("testExtensionViewCreationShouldSucceed", "extension_view", |
| 82 skeleton_app->id()); | 83 skeleton_app->id()); |
| 83 } | 84 } |
| 84 | 85 |
| 85 // Tests that verify that <extensionview> can navigate to different sources. | 86 // Tests that verify that <extensionview> can navigate to different sources. |
| 86 IN_PROC_BROWSER_TEST_F(ExtensionViewTest, ShimSrcAttribute) { | 87 IN_PROC_BROWSER_TEST_F(ExtensionViewTest, ShimSrcAttribute) { |
| 87 ASSERT_TRUE(RunPlatformAppTest( | 88 ASSERT_TRUE(RunPlatformAppTest( |
| 88 "platform_apps/extension_view/src_attribute")); | 89 "platform_apps/extension_view/src_attribute")); |
| 89 } | 90 } |
| 90 | 91 |
| 91 // Tests that verify that <extensionview> can call the connect function. | 92 // Tests that verify that <extensionview> can call the connect function. |
| 92 IN_PROC_BROWSER_TEST_F(ExtensionViewTest, ConnectAPICall) { | 93 IN_PROC_BROWSER_TEST_F(ExtensionViewTest, ConnectAPICall) { |
| 93 ASSERT_TRUE(RunPlatformAppTest("platform_apps/extension_view/connect_api")); | 94 ASSERT_TRUE(RunPlatformAppTest("platform_apps/extension_view/connect_api")); |
| 94 } | 95 } |
| 95 | 96 |
| 96 // Tests that verify that <extensionview> does not change extension ID if | 97 // Tests that verify that <extensionview> does not change extension ID if |
| 97 // someone tries to change it in JavaScript. | 98 // someone tries to change it in JavaScript. |
| 98 IN_PROC_BROWSER_TEST_F(ExtensionViewTest, ShimExtensionAttribute) { | 99 IN_PROC_BROWSER_TEST_F(ExtensionViewTest, ShimExtensionAttribute) { |
| 99 ASSERT_TRUE(RunPlatformAppTest( | 100 ASSERT_TRUE(RunPlatformAppTest( |
| 100 "platform_apps/extension_view/extension_attribute")); | 101 "platform_apps/extension_view/extension_attribute")); |
| 101 } | 102 } |
| OLD | NEW |