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

Side by Side Diff: chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc

Issue 14008005: Move proto files back into chrome/browser/policy/proto (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | 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/policy/device_cloud_policy_store_chromeos.h" 5 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/run_loop.h" 12 #include "base/run_loop.h"
13 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" 13 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
14 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
15 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h" 14 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
15 #include "chrome/browser/policy/proto/chromeos/chrome_device_policy.pb.h"
16 #include "chromeos/cryptohome/mock_cryptohome_library.h" 16 #include "chromeos/cryptohome/mock_cryptohome_library.h"
17 #include "chromeos/dbus/mock_cryptohome_client.h" 17 #include "chromeos/dbus/mock_cryptohome_client.h"
18 #include "policy/policy_constants.h" 18 #include "policy/policy_constants.h"
19 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
20 20
21 namespace policy { 21 namespace policy {
22 22
23 namespace { 23 namespace {
24 24
25 void CopyLockResult(base::RunLoop* loop, 25 void CopyLockResult(base::RunLoop* loop,
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 209
210 TEST_F(DeviceCloudPolicyStoreChromeOSTest, InstallInitialPolicyNotEnterprise) { 210 TEST_F(DeviceCloudPolicyStoreChromeOSTest, InstallInitialPolicyNotEnterprise) {
211 PrepareNewSigningKey(); 211 PrepareNewSigningKey();
212 ResetToNonEnterprise(); 212 ResetToNonEnterprise();
213 store_->InstallInitialPolicy(device_policy_.policy()); 213 store_->InstallInitialPolicy(device_policy_.policy());
214 FlushDeviceSettings(); 214 FlushDeviceSettings();
215 ExpectFailure(CloudPolicyStore::STATUS_BAD_STATE); 215 ExpectFailure(CloudPolicyStore::STATUS_BAD_STATE);
216 } 216 }
217 217
218 } // namespace policy 218 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698