Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: chrome/browser/chromeos/policy/device_local_account_browsertest.cc

Issue 2248873002: Convert WindowOpenDisposition to an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "chrome/browser/chromeos/policy/device_local_account.h" 5 #include "chrome/browser/chromeos/policy/device_local_account.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <map> 9 #include <map>
10 #include <memory> 10 #include <memory>
(...skipping 1547 matching lines...) Expand 10 before | Expand all | Expand 10 after
1558 base::FilePath test_dir; 1558 base::FilePath test_dir;
1559 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir)); 1559 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
1560 installer->InstallCrx(test_dir.Append(kPackagedAppCRXPath)); 1560 installer->InstallCrx(test_dir.Append(kPackagedAppCRXPath));
1561 app_install_observer.Wait(); 1561 app_install_observer.Wait();
1562 const extensions::Extension* app = 1562 const extensions::Extension* app =
1563 content::Details<const extensions::Extension>( 1563 content::Details<const extensions::Extension>(
1564 app_install_observer.details()).ptr(); 1564 app_install_observer.details()).ptr();
1565 1565
1566 // Start the platform app, causing it to open a window. 1566 // Start the platform app, causing it to open a window.
1567 run_loop_.reset(new base::RunLoop); 1567 run_loop_.reset(new base::RunLoop);
1568 OpenApplication(AppLaunchParams(profile, app, 1568 OpenApplication(AppLaunchParams(
1569 extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW, 1569 profile, app, extensions::LAUNCH_CONTAINER_NONE,
1570 extensions::SOURCE_TEST)); 1570 WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
1571 run_loop_->Run(); 1571 run_loop_->Run();
1572 EXPECT_EQ(1U, app_window_registry->app_windows().size()); 1572 EXPECT_EQ(1U, app_window_registry->app_windows().size());
1573 1573
1574 // Close the only open browser window. 1574 // Close the only open browser window.
1575 BrowserList* browser_list = BrowserList::GetInstance(); 1575 BrowserList* browser_list = BrowserList::GetInstance();
1576 EXPECT_EQ(1U, browser_list->size()); 1576 EXPECT_EQ(1U, browser_list->size());
1577 Browser* browser = browser_list->get(0); 1577 Browser* browser = browser_list->get(0);
1578 ASSERT_TRUE(browser); 1578 ASSERT_TRUE(browser);
1579 BrowserWindow* browser_window = browser->window(); 1579 BrowserWindow* browser_window = browser->window();
1580 ASSERT_TRUE(browser_window); 1580 ASSERT_TRUE(browser_window);
(...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after
2444 ASSERT_TRUE(content::ExecuteScript(contents_, 2444 ASSERT_TRUE(content::ExecuteScript(contents_,
2445 "$('tos-accept-button').click();")); 2445 "$('tos-accept-button').click();"));
2446 2446
2447 WaitForSessionStart(); 2447 WaitForSessionStart();
2448 } 2448 }
2449 2449
2450 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, 2450 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance,
2451 TermsOfServiceDownloadTest, testing::Bool()); 2451 TermsOfServiceDownloadTest, testing::Bool());
2452 2452
2453 } // namespace policy 2453 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/signin/oauth2_browsertest.cc ('k') | chrome/browser/command_updater.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698