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

Side by Side Diff: chrome/browser/chromeos/attestation/attestation_policy_browsertest.cc

Issue 654263003: Implemented OwnerSettingsService::Set() method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed crashes under asan. Created 6 years, 1 month 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/chromeos/ownership/owner_settings_service_chromeos.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/memory/ref_counted.h" 6 #include "base/memory/ref_counted.h"
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "base/threading/platform_thread.h" 8 #include "base/threading/platform_thread.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h" 10 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h"
(...skipping 22 matching lines...) Expand all
33 33
34 class AttestationDevicePolicyTest 34 class AttestationDevicePolicyTest
35 : public DevicePolicyCrosBrowserTest, 35 : public DevicePolicyCrosBrowserTest,
36 public chromeos::DeviceSettingsService::Observer { 36 public chromeos::DeviceSettingsService::Observer {
37 public: 37 public:
38 // DeviceSettingsService::Observer 38 // DeviceSettingsService::Observer
39 virtual void OwnershipStatusChanged() override {} 39 virtual void OwnershipStatusChanged() override {}
40 virtual void DeviceSettingsUpdated() override { 40 virtual void DeviceSettingsUpdated() override {
41 operation_complete_ = true; 41 operation_complete_ = true;
42 } 42 }
43 virtual void OnDeviceSettingsServiceShutdown() override {}
43 44
44 protected: 45 protected:
45 AttestationDevicePolicyTest() : operation_complete_(false) {} 46 AttestationDevicePolicyTest() : operation_complete_(false) {}
46 47
47 virtual void SetUpInProcessBrowserTestFixture() override { 48 virtual void SetUpInProcessBrowserTestFixture() override {
48 DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture(); 49 DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
49 InstallOwnerKey(); 50 InstallOwnerKey();
50 RefreshDevicePolicy(); 51 RefreshDevicePolicy();
51 } 52 }
52 53
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 SyncContentProtectionAttestation()); 116 SyncContentProtectionAttestation());
116 117
117 GetDevicePolicyProto()->set_content_protection_enabled(true); 118 GetDevicePolicyProto()->set_content_protection_enabled(true);
118 SyncRefreshDevicePolicy(); 119 SyncRefreshDevicePolicy();
119 120
120 EXPECT_NE(PlatformVerificationFlow::POLICY_REJECTED, 121 EXPECT_NE(PlatformVerificationFlow::POLICY_REJECTED,
121 SyncContentProtectionAttestation()); 122 SyncContentProtectionAttestation());
122 } 123 }
123 124
124 } // namespace policy 125 } // namespace policy
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698