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

Unified Diff: chrome/browser/policy/policy_browsertest.cc

Issue 12212120: Replace most BrowserList::empty() and BrowserList::size() calls by multi-desktop aware calls. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge up to r182110 Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/policy/policy_browsertest.cc
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 0147cf8e33efcd50538bf73f05e879f6183dfda3..c1d711513e4293f811b7cecd27a5cdf5fa176c9e 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -47,9 +47,10 @@
#include "chrome/browser/ui/bookmarks/bookmark_bar.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_list_impl.h"
#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/omnibox/location_bar.h"
#include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
#include "chrome/browser/ui/omnibox/omnibox_view.h"
@@ -1296,25 +1297,29 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, HomepageLocation) {
IN_PROC_BROWSER_TEST_F(PolicyTest, IncognitoEnabled) {
// Verifies that incognito windows can't be opened when disabled by policy.
+ // Only test this on the native desktop.
+ const chrome::BrowserListImpl* native_browser_list =
+ chrome::BrowserListImpl::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE);
+
// Disable incognito via policy and verify that incognito windows can't be
// opened.
- EXPECT_EQ(1u, BrowserList::size());
- EXPECT_FALSE(BrowserList::IsOffTheRecordSessionActive());
+ EXPECT_EQ(1u, native_browser_list->size());
+ EXPECT_FALSE(native_browser_list->IsIncognitoWindowOpen());
PolicyMap policies;
policies.Set(key::kIncognitoEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(false));
UpdateProviderPolicy(policies);
EXPECT_FALSE(chrome::ExecuteCommand(browser(), IDC_NEW_INCOGNITO_WINDOW));
- EXPECT_EQ(1u, BrowserList::size());
- EXPECT_FALSE(BrowserList::IsOffTheRecordSessionActive());
+ EXPECT_EQ(1u, native_browser_list->size());
+ EXPECT_FALSE(native_browser_list->IsIncognitoWindowOpen());
// Enable via policy and verify that incognito windows can be opened.
policies.Set(key::kIncognitoEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(true));
UpdateProviderPolicy(policies);
EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_NEW_INCOGNITO_WINDOW));
- EXPECT_EQ(2u, BrowserList::size());
- EXPECT_TRUE(BrowserList::IsOffTheRecordSessionActive());
+ EXPECT_EQ(2u, native_browser_list->size());
+ EXPECT_TRUE(native_browser_list->IsIncognitoWindowOpen());
}
IN_PROC_BROWSER_TEST_F(PolicyTest, Javascript) {
« no previous file with comments | « chrome/browser/lifetime/application_lifetime.cc ('k') | chrome/browser/printing/print_preview_dialog_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698