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

Side by Side Diff: chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_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 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 <string> 5 #include <string>
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chromeos/policy/login_policy_test_base.h" 10 #include "chrome/browser/chromeos/policy/login_policy_test_base.h"
(...skipping 25 matching lines...) Expand all
36 }; 36 };
37 37
38 IN_PROC_BROWSER_TEST_F(UserCloudPolicyManagerTest, StartSession) { 38 IN_PROC_BROWSER_TEST_F(UserCloudPolicyManagerTest, StartSession) {
39 const char* const kStartupURLs[] = {"chrome://policy", "chrome://about"}; 39 const char* const kStartupURLs[] = {"chrome://policy", "chrome://about"};
40 40
41 SkipToLoginScreen(); 41 SkipToLoginScreen();
42 LogIn(kAccountId, kAccountPassword); 42 LogIn(kAccountId, kAccountPassword);
43 43
44 // Check that the startup pages specified in policy were opened. 44 // Check that the startup pages specified in policy were opened.
45 BrowserList* browser_list = 45 BrowserList* browser_list =
46 BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH); 46 BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH);
47 EXPECT_EQ(1U, browser_list->size()); 47 EXPECT_EQ(1U, browser_list->size());
48 Browser* browser = browser_list->get(0); 48 Browser* browser = browser_list->get(0);
49 ASSERT_TRUE(browser); 49 ASSERT_TRUE(browser);
50 50
51 TabStripModel* tabs = browser->tab_strip_model(); 51 TabStripModel* tabs = browser->tab_strip_model();
52 ASSERT_TRUE(tabs); 52 ASSERT_TRUE(tabs);
53 const int expected_tab_count = static_cast<int>(arraysize(kStartupURLs)); 53 const int expected_tab_count = static_cast<int>(arraysize(kStartupURLs));
54 EXPECT_EQ(expected_tab_count, tabs->count()); 54 EXPECT_EQ(expected_tab_count, tabs->count());
55 for (int i = 0; i < expected_tab_count && i < tabs->count(); ++i) { 55 for (int i = 0; i < expected_tab_count && i < tabs->count(); ++i) {
56 EXPECT_EQ(GURL(kStartupURLs[i]), 56 EXPECT_EQ(GURL(kStartupURLs[i]),
57 tabs->GetWebContentsAt(i)->GetVisibleURL()); 57 tabs->GetWebContentsAt(i)->GetVisibleURL());
58 } 58 }
59 } 59 }
60 60
61 } // namespace policy 61 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698