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

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

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 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 <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 947 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 UploadAndInstallDeviceLocalAccountPolicy(); 958 UploadAndInstallDeviceLocalAccountPolicy();
959 AddPublicSessionToDevicePolicy(kAccountId1); 959 AddPublicSessionToDevicePolicy(kAccountId1);
960 960
961 WaitForPolicy(); 961 WaitForPolicy();
962 962
963 ASSERT_NO_FATAL_FAILURE(StartLogin(std::string(), std::string())); 963 ASSERT_NO_FATAL_FAILURE(StartLogin(std::string(), std::string()));
964 WaitForSessionStart(); 964 WaitForSessionStart();
965 965
966 // Check that the startup pages specified in policy were opened. 966 // Check that the startup pages specified in policy were opened.
967 BrowserList* browser_list = 967 BrowserList* browser_list =
968 BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH); 968 BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH);
969 EXPECT_EQ(1U, browser_list->size()); 969 EXPECT_EQ(1U, browser_list->size());
970 Browser* browser = browser_list->get(0); 970 Browser* browser = browser_list->get(0);
971 ASSERT_TRUE(browser); 971 ASSERT_TRUE(browser);
972 972
973 TabStripModel* tabs = browser->tab_strip_model(); 973 TabStripModel* tabs = browser->tab_strip_model();
974 ASSERT_TRUE(tabs); 974 ASSERT_TRUE(tabs);
975 int expected_tab_count = static_cast<int>(arraysize(kStartupURLs)); 975 int expected_tab_count = static_cast<int>(arraysize(kStartupURLs));
976 EXPECT_EQ(expected_tab_count, tabs->count()); 976 EXPECT_EQ(expected_tab_count, tabs->count());
977 for (int i = 0; i < expected_tab_count && i < tabs->count(); ++i) { 977 for (int i = 0; i < expected_tab_count && i < tabs->count(); ++i) {
978 EXPECT_EQ(GURL(kStartupURLs[i]), 978 EXPECT_EQ(GURL(kStartupURLs[i]),
(...skipping 11 matching lines...) Expand all
990 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, FullscreenDisallowed) { 990 IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, FullscreenDisallowed) {
991 UploadAndInstallDeviceLocalAccountPolicy(); 991 UploadAndInstallDeviceLocalAccountPolicy();
992 AddPublicSessionToDevicePolicy(kAccountId1); 992 AddPublicSessionToDevicePolicy(kAccountId1);
993 993
994 WaitForPolicy(); 994 WaitForPolicy();
995 995
996 ASSERT_NO_FATAL_FAILURE(StartLogin(std::string(), std::string())); 996 ASSERT_NO_FATAL_FAILURE(StartLogin(std::string(), std::string()));
997 WaitForSessionStart(); 997 WaitForSessionStart();
998 998
999 BrowserList* browser_list = 999 BrowserList* browser_list =
1000 BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH); 1000 BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH);
1001 EXPECT_EQ(1U, browser_list->size()); 1001 EXPECT_EQ(1U, browser_list->size());
1002 Browser* browser = browser_list->get(0); 1002 Browser* browser = browser_list->get(0);
1003 ASSERT_TRUE(browser); 1003 ASSERT_TRUE(browser);
1004 BrowserWindow* browser_window = browser->window(); 1004 BrowserWindow* browser_window = browser->window();
1005 ASSERT_TRUE(browser_window); 1005 ASSERT_TRUE(browser_window);
1006 1006
1007 // Verify that an attempt to enter fullscreen mode is denied. 1007 // Verify that an attempt to enter fullscreen mode is denied.
1008 EXPECT_FALSE(browser_window->IsFullscreen()); 1008 EXPECT_FALSE(browser_window->IsFullscreen());
1009 chrome::ToggleFullscreenMode(browser); 1009 chrome::ToggleFullscreenMode(browser);
1010 EXPECT_FALSE(browser_window->IsFullscreen()); 1010 EXPECT_FALSE(browser_window->IsFullscreen());
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
1498 // Start the platform app, causing it to open a window. 1498 // Start the platform app, causing it to open a window.
1499 run_loop_.reset(new base::RunLoop); 1499 run_loop_.reset(new base::RunLoop);
1500 OpenApplication(AppLaunchParams(profile, app, 1500 OpenApplication(AppLaunchParams(profile, app,
1501 extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW, 1501 extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW,
1502 extensions::SOURCE_TEST)); 1502 extensions::SOURCE_TEST));
1503 run_loop_->Run(); 1503 run_loop_->Run();
1504 EXPECT_EQ(1U, app_window_registry->app_windows().size()); 1504 EXPECT_EQ(1U, app_window_registry->app_windows().size());
1505 1505
1506 // Close the only open browser window. 1506 // Close the only open browser window.
1507 BrowserList* browser_list = 1507 BrowserList* browser_list =
1508 BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH); 1508 BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH);
1509 EXPECT_EQ(1U, browser_list->size()); 1509 EXPECT_EQ(1U, browser_list->size());
1510 Browser* browser = browser_list->get(0); 1510 Browser* browser = browser_list->get(0);
1511 ASSERT_TRUE(browser); 1511 ASSERT_TRUE(browser);
1512 BrowserWindow* browser_window = browser->window(); 1512 BrowserWindow* browser_window = browser->window();
1513 ASSERT_TRUE(browser_window); 1513 ASSERT_TRUE(browser_window);
1514 run_loop_.reset(new base::RunLoop); 1514 run_loop_.reset(new base::RunLoop);
1515 browser_window->Close(); 1515 browser_window->Close();
1516 browser_window = NULL; 1516 browser_window = NULL;
1517 run_loop_->Run(); 1517 run_loop_->Run();
1518 browser = NULL; 1518 browser = NULL;
(...skipping 864 matching lines...) Expand 10 before | Expand all | Expand 10 after
2383 ASSERT_TRUE(content::ExecuteScript(contents_, 2383 ASSERT_TRUE(content::ExecuteScript(contents_,
2384 "$('tos-accept-button').click();")); 2384 "$('tos-accept-button').click();"));
2385 2385
2386 WaitForSessionStart(); 2386 WaitForSessionStart();
2387 } 2387 }
2388 2388
2389 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, 2389 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance,
2390 TermsOfServiceDownloadTest, testing::Bool()); 2390 TermsOfServiceDownloadTest, testing::Bool());
2391 2391
2392 } // namespace policy 2392 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698