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 "content/public/browser/notification_service.h" | 7 #include "content/public/browser/notification_service.h" |
8 #include "content/public/browser/render_process_host.h" | 8 #include "content/public/browser/render_process_host.h" |
9 #include "content/public/test/browser_test_utils.h" | 9 #include "content/public/test/browser_test_utils.h" |
10 #include "content/public/test/test_utils.h" | 10 #include "content/public/test/test_utils.h" |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 base::StringPrintf("runTest('%s', '%s')", | 123 base::StringPrintf("runTest('%s', '%s')", |
124 test_name.c_str(), | 124 test_name.c_str(), |
125 app_to_embed.c_str()))) { | 125 app_to_embed.c_str()))) { |
126 LOG(ERROR) << "UNABLE TO START TEST."; | 126 LOG(ERROR) << "UNABLE TO START TEST."; |
127 return; | 127 return; |
128 } | 128 } |
129 ASSERT_TRUE(done_listener.WaitUntilSatisfied()); | 129 ASSERT_TRUE(done_listener.WaitUntilSatisfied()); |
130 } | 130 } |
131 | 131 |
132 private: | 132 private: |
133 void SetUpCommandLine(CommandLine* command_line) override { | 133 void SetUpCommandLine(base::CommandLine* command_line) override { |
134 extensions::PlatformAppBrowserTest::SetUpCommandLine(command_line); | 134 extensions::PlatformAppBrowserTest::SetUpCommandLine(command_line); |
135 } | 135 } |
136 | 136 |
137 TestGuestViewManagerFactory factory_; | 137 TestGuestViewManagerFactory factory_; |
138 }; | 138 }; |
139 | 139 |
140 // Tests that <appview> is able to navigate to another installed app. | 140 // Tests that <appview> is able to navigate to another installed app. |
141 IN_PROC_BROWSER_TEST_F(AppViewTest, TestAppViewWithUndefinedDataShouldSucceed) { | 141 IN_PROC_BROWSER_TEST_F(AppViewTest, TestAppViewWithUndefinedDataShouldSucceed) { |
142 const extensions::Extension* skeleton_app = | 142 const extensions::Extension* skeleton_app = |
143 InstallPlatformApp("app_view/shim/skeleton"); | 143 InstallPlatformApp("app_view/shim/skeleton"); |
(...skipping 25 matching lines...) Expand all Loading... |
169 | 169 |
170 // Tests that <appview> correctly handles multiple successive connects. | 170 // Tests that <appview> correctly handles multiple successive connects. |
171 IN_PROC_BROWSER_TEST_F(AppViewTest, TestAppViewMultipleConnects) { | 171 IN_PROC_BROWSER_TEST_F(AppViewTest, TestAppViewMultipleConnects) { |
172 const extensions::Extension* skeleton_app = | 172 const extensions::Extension* skeleton_app = |
173 InstallPlatformApp("app_view/shim/skeleton"); | 173 InstallPlatformApp("app_view/shim/skeleton"); |
174 TestHelper("testAppViewMultipleConnects", | 174 TestHelper("testAppViewMultipleConnects", |
175 "app_view/shim", | 175 "app_view/shim", |
176 skeleton_app->id(), | 176 skeleton_app->id(), |
177 NO_TEST_SERVER); | 177 NO_TEST_SERVER); |
178 } | 178 } |
OLD | NEW |