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

Unified Diff: chrome/browser/chromeos/extensions/public_session_permission_helper_unittest.cc

Issue 2919933002: Revert of ChromeOS: Per-user time zone: refactor tests first. (Closed)
Patch Set: Created 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/extensions/public_session_permission_helper_unittest.cc
diff --git a/chrome/browser/chromeos/extensions/public_session_permission_helper_unittest.cc b/chrome/browser/chromeos/extensions/public_session_permission_helper_unittest.cc
index 4539fa28f664333694bf9e2a6f5b5c6ee3151b2b..56b71b154586c33718caa0508f4e666982827a1c 100644
--- a/chrome/browser/chromeos/extensions/public_session_permission_helper_unittest.cc
+++ b/chrome/browser/chromeos/extensions/public_session_permission_helper_unittest.cc
@@ -119,7 +119,7 @@
std::vector<PermissionIDSet> allowed_permissions_;
- std::unique_ptr<chromeos::ScopedTestPublicSessionLoginState> login_state_;
+ chromeos::ScopedTestPublicSessionLoginState login_state_;
private:
DISALLOW_COPY_AND_ASSIGN(PublicSessionPermissionHelperTest);
@@ -127,13 +127,11 @@
void PublicSessionPermissionHelperTest::SetUp() {
ChromeRenderViewHostTestHarness::SetUp();
- login_state_.reset(new chromeos::ScopedTestPublicSessionLoginState());
extension_a_ = LoadManifestHelper("extension_a");
extension_b_ = LoadManifestHelper("extension_b");
}
void PublicSessionPermissionHelperTest::TearDown() {
- login_state_.reset();
ResetPermissionsForTesting();
ChromeRenderViewHostTestHarness::TearDown();
}

Powered by Google App Engine
This is Rietveld 408576698