Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 <map> | 5 #include <map> |
| 6 #include <set> | 6 #include <set> |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 1320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1331 installer->InstallCrx(test_dir.Append(kPackagedAppCRXPath)); | 1331 installer->InstallCrx(test_dir.Append(kPackagedAppCRXPath)); |
| 1332 app_install_observer.Wait(); | 1332 app_install_observer.Wait(); |
| 1333 const extensions::Extension* app = | 1333 const extensions::Extension* app = |
| 1334 content::Details<const extensions::Extension>( | 1334 content::Details<const extensions::Extension>( |
| 1335 app_install_observer.details()).ptr(); | 1335 app_install_observer.details()).ptr(); |
| 1336 | 1336 |
| 1337 // Start the platform app, causing it to open a window. | 1337 // Start the platform app, causing it to open a window. |
| 1338 run_loop_.reset(new base::RunLoop); | 1338 run_loop_.reset(new base::RunLoop); |
| 1339 OpenApplication(AppLaunchParams(profile, app, | 1339 OpenApplication(AppLaunchParams(profile, app, |
| 1340 extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW, | 1340 extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW, |
| 1341 extensions::SOURCE_UNTRACKED)); | 1341 extensions::SOURCE_BROWSER_TEST)); |
|
benwells
2014/12/04 03:44:47
This (and some others) still say BROWSER_TEST.
Jamie
2014/12/04 18:10:01
Done.
| |
| 1342 run_loop_->Run(); | 1342 run_loop_->Run(); |
| 1343 EXPECT_EQ(1U, app_window_registry->app_windows().size()); | 1343 EXPECT_EQ(1U, app_window_registry->app_windows().size()); |
| 1344 | 1344 |
| 1345 // Close the only open browser window. | 1345 // Close the only open browser window. |
| 1346 BrowserList* browser_list = | 1346 BrowserList* browser_list = |
| 1347 BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH); | 1347 BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH); |
| 1348 EXPECT_EQ(1U, browser_list->size()); | 1348 EXPECT_EQ(1U, browser_list->size()); |
| 1349 Browser* browser = browser_list->get(0); | 1349 Browser* browser = browser_list->get(0); |
| 1350 ASSERT_TRUE(browser); | 1350 ASSERT_TRUE(browser); |
| 1351 BrowserWindow* browser_window = browser->window(); | 1351 BrowserWindow* browser_window = browser->window(); |
| (...skipping 843 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2195 ASSERT_TRUE(content::ExecuteScript(contents_, | 2195 ASSERT_TRUE(content::ExecuteScript(contents_, |
| 2196 "$('tos-accept-button').click();")); | 2196 "$('tos-accept-button').click();")); |
| 2197 | 2197 |
| 2198 WaitForSessionStart(); | 2198 WaitForSessionStart(); |
| 2199 } | 2199 } |
| 2200 | 2200 |
| 2201 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, | 2201 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, |
| 2202 TermsOfServiceDownloadTest, testing::Bool()); | 2202 TermsOfServiceDownloadTest, testing::Bool()); |
| 2203 | 2203 |
| 2204 } // namespace policy | 2204 } // namespace policy |
| OLD | NEW |