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

Side by Side Diff: chrome/browser/chromeos/login/login_utils_browsertest.cc

Issue 292983003: Use different Access Point on iOS for phone and tablet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/rlz/rlz.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/login/login_utils.h" 5 #include "chrome/browser/chromeos/login/login_utils.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 // Wait for blocking RLZ tasks to complete. 579 // Wait for blocking RLZ tasks to complete.
580 RunUntilIdle(); 580 RunUntilIdle();
581 581
582 // RLZ brand code has been set to empty string. 582 // RLZ brand code has been set to empty string.
583 EXPECT_TRUE(local_state_.Get()->HasPrefPath(prefs::kRLZBrand)); 583 EXPECT_TRUE(local_state_.Get()->HasPrefPath(prefs::kRLZBrand));
584 EXPECT_EQ(std::string(), local_state_.Get()->GetString(prefs::kRLZBrand)); 584 EXPECT_EQ(std::string(), local_state_.Get()->GetString(prefs::kRLZBrand));
585 585
586 // RLZ value for homepage access point should have been initialized. 586 // RLZ value for homepage access point should have been initialized.
587 base::string16 rlz_string; 587 base::string16 rlz_string;
588 EXPECT_TRUE(RLZTracker::GetAccessPointRlz( 588 EXPECT_TRUE(RLZTracker::GetAccessPointRlz(
589 RLZTracker::CHROME_HOME_PAGE, &rlz_string)); 589 RLZTracker::ChromeHomePage(), &rlz_string));
590 EXPECT_EQ(base::string16(), rlz_string); 590 EXPECT_EQ(base::string16(), rlz_string);
591 } 591 }
592 #endif 592 #endif
593 593
594 TEST_P(LoginUtilsBlockingLoginTest, EnterpriseLoginBlocksForEnterpriseUser) { 594 TEST_P(LoginUtilsBlockingLoginTest, EnterpriseLoginBlocksForEnterpriseUser) {
595 UserManager* user_manager = UserManager::Get(); 595 UserManager* user_manager = UserManager::Get();
596 EXPECT_FALSE(user_manager->IsUserLoggedIn()); 596 EXPECT_FALSE(user_manager->IsUserLoggedIn());
597 EXPECT_FALSE(connector_->IsEnterpriseManaged()); 597 EXPECT_FALSE(connector_->IsEnterpriseManaged());
598 EXPECT_FALSE(prepared_profile_); 598 EXPECT_FALSE(prepared_profile_);
599 599
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 } 697 }
698 698
699 INSTANTIATE_TEST_CASE_P( 699 INSTANTIATE_TEST_CASE_P(
700 LoginUtilsBlockingLoginTestInstance, 700 LoginUtilsBlockingLoginTestInstance,
701 LoginUtilsBlockingLoginTest, 701 LoginUtilsBlockingLoginTest,
702 testing::Values(0, 1, 2, 3, 4, 5)); 702 testing::Values(0, 1, 2, 3, 4, 5));
703 703
704 } // namespace 704 } // namespace
705 705
706 } // namespace chromeos 706 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/rlz/rlz.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698