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

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

Issue 1637943003: Remove HostDesktopType from BrowserList::GetInstance() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@screen-wrapper-land
Patch Set: mac2 Created 4 years, 11 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 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 1007 matching lines...) Expand 10 before | Expand all | Expand 10 after
1018 startup_urls_proto->mutable_value()->add_entries(kStartupURLs[i]); 1018 startup_urls_proto->mutable_value()->add_entries(kStartupURLs[i]);
1019 UploadAndInstallDeviceLocalAccountPolicy(); 1019 UploadAndInstallDeviceLocalAccountPolicy();
1020 AddPublicSessionToDevicePolicy(kAccountId1); 1020 AddPublicSessionToDevicePolicy(kAccountId1);
1021 1021
1022 WaitForPolicy(); 1022 WaitForPolicy();
1023 1023
1024 ASSERT_NO_FATAL_FAILURE(StartLogin(std::string(), std::string())); 1024 ASSERT_NO_FATAL_FAILURE(StartLogin(std::string(), std::string()));
1025 WaitForSessionStart(); 1025 WaitForSessionStart();
1026 1026
1027 // Check that the startup pages specified in policy were opened. 1027 // Check that the startup pages specified in policy were opened.
1028 BrowserList* browser_list = 1028 BrowserList* browser_list = BrowserList::GetInstance();
1029 BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
1030 EXPECT_EQ(1U, browser_list->size()); 1029 EXPECT_EQ(1U, browser_list->size());
1031 Browser* browser = browser_list->get(0); 1030 Browser* browser = browser_list->get(0);
1032 ASSERT_TRUE(browser); 1031 ASSERT_TRUE(browser);
1033 1032
1034 TabStripModel* tabs = browser->tab_strip_model(); 1033 TabStripModel* tabs = browser->tab_strip_model();
1035 ASSERT_TRUE(tabs); 1034 ASSERT_TRUE(tabs);
1036 int expected_tab_count = static_cast<int>(arraysize(kStartupURLs)); 1035 int expected_tab_count = static_cast<int>(arraysize(kStartupURLs));
1037 EXPECT_EQ(expected_tab_count, tabs->count()); 1036 EXPECT_EQ(expected_tab_count, tabs->count());
1038 for (int i = 0; i < expected_tab_count && i < tabs->count(); ++i) { 1037 for (int i = 0; i < expected_tab_count && i < tabs->count(); ++i) {
1039 EXPECT_EQ(GURL(kStartupURLs[i]), 1038 EXPECT_EQ(GURL(kStartupURLs[i]),
(...skipping 10 matching lines...) Expand all
1050 1049
1051 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, FullscreenDisallowed) { 1050 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, FullscreenDisallowed) {
1052 UploadAndInstallDeviceLocalAccountPolicy(); 1051 UploadAndInstallDeviceLocalAccountPolicy();
1053 AddPublicSessionToDevicePolicy(kAccountId1); 1052 AddPublicSessionToDevicePolicy(kAccountId1);
1054 1053
1055 WaitForPolicy(); 1054 WaitForPolicy();
1056 1055
1057 ASSERT_NO_FATAL_FAILURE(StartLogin(std::string(), std::string())); 1056 ASSERT_NO_FATAL_FAILURE(StartLogin(std::string(), std::string()));
1058 WaitForSessionStart(); 1057 WaitForSessionStart();
1059 1058
1060 BrowserList* browser_list = 1059 BrowserList* browser_list = BrowserList::GetInstance();
1061 BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
1062 EXPECT_EQ(1U, browser_list->size()); 1060 EXPECT_EQ(1U, browser_list->size());
1063 Browser* browser = browser_list->get(0); 1061 Browser* browser = browser_list->get(0);
1064 ASSERT_TRUE(browser); 1062 ASSERT_TRUE(browser);
1065 BrowserWindow* browser_window = browser->window(); 1063 BrowserWindow* browser_window = browser->window();
1066 ASSERT_TRUE(browser_window); 1064 ASSERT_TRUE(browser_window);
1067 1065
1068 // Verify that an attempt to enter fullscreen mode is denied. 1066 // Verify that an attempt to enter fullscreen mode is denied.
1069 EXPECT_FALSE(browser_window->IsFullscreen()); 1067 EXPECT_FALSE(browser_window->IsFullscreen());
1070 chrome::ToggleFullscreenMode(browser); 1068 chrome::ToggleFullscreenMode(browser);
1071 EXPECT_FALSE(browser_window->IsFullscreen()); 1069 EXPECT_FALSE(browser_window->IsFullscreen());
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
1554 1552
1555 // Start the platform app, causing it to open a window. 1553 // Start the platform app, causing it to open a window.
1556 run_loop_.reset(new base::RunLoop); 1554 run_loop_.reset(new base::RunLoop);
1557 OpenApplication(AppLaunchParams(profile, app, 1555 OpenApplication(AppLaunchParams(profile, app,
1558 extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW, 1556 extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW,
1559 extensions::SOURCE_TEST)); 1557 extensions::SOURCE_TEST));
1560 run_loop_->Run(); 1558 run_loop_->Run();
1561 EXPECT_EQ(1U, app_window_registry->app_windows().size()); 1559 EXPECT_EQ(1U, app_window_registry->app_windows().size());
1562 1560
1563 // Close the only open browser window. 1561 // Close the only open browser window.
1564 BrowserList* browser_list = 1562 BrowserList* browser_list = BrowserList::GetInstance();
1565 BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
1566 EXPECT_EQ(1U, browser_list->size()); 1563 EXPECT_EQ(1U, browser_list->size());
1567 Browser* browser = browser_list->get(0); 1564 Browser* browser = browser_list->get(0);
1568 ASSERT_TRUE(browser); 1565 ASSERT_TRUE(browser);
1569 BrowserWindow* browser_window = browser->window(); 1566 BrowserWindow* browser_window = browser->window();
1570 ASSERT_TRUE(browser_window); 1567 ASSERT_TRUE(browser_window);
1571 run_loop_.reset(new base::RunLoop); 1568 run_loop_.reset(new base::RunLoop);
1572 browser_window->Close(); 1569 browser_window->Close();
1573 browser_window = NULL; 1570 browser_window = NULL;
1574 run_loop_->Run(); 1571 run_loop_->Run();
1575 browser = NULL; 1572 browser = NULL;
(...skipping 858 matching lines...) Expand 10 before | Expand all | Expand 10 after
2434 ASSERT_TRUE(content::ExecuteScript(contents_, 2431 ASSERT_TRUE(content::ExecuteScript(contents_,
2435 "$('tos-accept-button').click();")); 2432 "$('tos-accept-button').click();"));
2436 2433
2437 WaitForSessionStart(); 2434 WaitForSessionStart();
2438 } 2435 }
2439 2436
2440 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, 2437 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance,
2441 TermsOfServiceDownloadTest, testing::Bool()); 2438 TermsOfServiceDownloadTest, testing::Bool());
2442 2439
2443 } // namespace policy 2440 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698