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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc

Issue 2664753002: Remove base::StringValue (Closed)
Patch Set: Rebase Created 3 years, 9 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 95
96 class SharedOptionsTest : public LoginManagerTest { 96 class SharedOptionsTest : public LoginManagerTest {
97 public: 97 public:
98 SharedOptionsTest() 98 SharedOptionsTest()
99 : LoginManagerTest(false), 99 : LoginManagerTest(false),
100 stub_settings_provider_(base::MakeUnique<StubCrosSettingsProvider>()), 100 stub_settings_provider_(base::MakeUnique<StubCrosSettingsProvider>()),
101 stub_settings_provider_ptr_(static_cast<StubCrosSettingsProvider*>( 101 stub_settings_provider_ptr_(static_cast<StubCrosSettingsProvider*>(
102 stub_settings_provider_.get())), 102 stub_settings_provider_.get())),
103 test_owner_account_id_(AccountId::FromUserEmail(kTestOwner)), 103 test_owner_account_id_(AccountId::FromUserEmail(kTestOwner)),
104 test_non_owner_account_id_(AccountId::FromUserEmail(kTestNonOwner)) { 104 test_non_owner_account_id_(AccountId::FromUserEmail(kTestNonOwner)) {
105 stub_settings_provider_->Set(kDeviceOwner, base::StringValue(kTestOwner)); 105 stub_settings_provider_->Set(kDeviceOwner, base::Value(kTestOwner));
106 } 106 }
107 107
108 ~SharedOptionsTest() override {} 108 ~SharedOptionsTest() override {}
109 109
110 void SetUpOnMainThread() override { 110 void SetUpOnMainThread() override {
111 LoginManagerTest::SetUpOnMainThread(); 111 LoginManagerTest::SetUpOnMainThread();
112 112
113 CrosSettings* settings = CrosSettings::Get(); 113 CrosSettings* settings = CrosSettings::Get();
114 114
115 // Add the stub settings provider, moving the device settings provider 115 // Add the stub settings provider, moving the device settings provider
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 content::WaitForLoadStop(contents); 458 content::WaitForLoadStop(contents);
459 { 459 {
460 SCOPED_TRACE("Screen lock false for both users"); 460 SCOPED_TRACE("Screen lock false for both users");
461 expected_value = false; 461 expected_value = false;
462 CheckBooleanPreference(contents, prefs::kEnableAutoScreenLock, disabled, 462 CheckBooleanPreference(contents, prefs::kEnableAutoScreenLock, disabled,
463 empty_controlled, expected_value); 463 empty_controlled, expected_value);
464 } 464 }
465 } 465 }
466 466
467 } // namespace chromeos 467 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698