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

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

Issue 105193002: Replace string16 with base::string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | Annotate | Revision Log
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 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 544
545 wait_for_rlz_init.Run(); 545 wait_for_rlz_init.Run();
546 // Wait for blocking RLZ tasks to complete. 546 // Wait for blocking RLZ tasks to complete.
547 RunUntilIdle(); 547 RunUntilIdle();
548 548
549 // RLZ brand code has been set to empty string. 549 // RLZ brand code has been set to empty string.
550 EXPECT_TRUE(local_state_.Get()->HasPrefPath(prefs::kRLZBrand)); 550 EXPECT_TRUE(local_state_.Get()->HasPrefPath(prefs::kRLZBrand));
551 EXPECT_EQ(std::string(), local_state_.Get()->GetString(prefs::kRLZBrand)); 551 EXPECT_EQ(std::string(), local_state_.Get()->GetString(prefs::kRLZBrand));
552 552
553 // RLZ value for homepage access point should have been initialized. 553 // RLZ value for homepage access point should have been initialized.
554 string16 rlz_string; 554 base::string16 rlz_string;
555 EXPECT_TRUE(RLZTracker::GetAccessPointRlz( 555 EXPECT_TRUE(RLZTracker::GetAccessPointRlz(
556 RLZTracker::CHROME_HOME_PAGE, &rlz_string)); 556 RLZTracker::CHROME_HOME_PAGE, &rlz_string));
557 EXPECT_EQ(string16(), rlz_string); 557 EXPECT_EQ(string16(), rlz_string);
558 } 558 }
559 #endif 559 #endif
560 560
561 TEST_P(LoginUtilsBlockingLoginTest, EnterpriseLoginBlocksForEnterpriseUser) { 561 TEST_P(LoginUtilsBlockingLoginTest, EnterpriseLoginBlocksForEnterpriseUser) {
562 UserManager* user_manager = UserManager::Get(); 562 UserManager* user_manager = UserManager::Get();
563 EXPECT_FALSE(user_manager->IsUserLoggedIn()); 563 EXPECT_FALSE(user_manager->IsUserLoggedIn());
564 EXPECT_FALSE(connector_->IsEnterpriseManaged()); 564 EXPECT_FALSE(connector_->IsEnterpriseManaged());
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 } 664 }
665 665
666 INSTANTIATE_TEST_CASE_P( 666 INSTANTIATE_TEST_CASE_P(
667 LoginUtilsBlockingLoginTestInstance, 667 LoginUtilsBlockingLoginTestInstance,
668 LoginUtilsBlockingLoginTest, 668 LoginUtilsBlockingLoginTest,
669 testing::Values(0, 1, 2, 3, 4, 5)); 669 testing::Values(0, 1, 2, 3, 4, 5));
670 670
671 } // namespace 671 } // namespace
672 672
673 } // namespace chromeos 673 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/login_utils.cc ('k') | chrome/browser/chromeos/login/login_web_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698