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

Side by Side Diff: chrome/browser/chromeos/settings/device_settings_provider_unittest.cc

Issue 565293003: Revert of Non-plafrom-specific part of an OwnerSettingsService is moved to components/ownership/*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 (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/settings/device_settings_provider.h" 5 #include "chrome/browser/chromeos/settings/device_settings_provider.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/files/file_util.h" 11 #include "base/files/file_util.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/test/scoped_path_override.h" 13 #include "base/test/scoped_path_override.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/chromeos/login/users/fake_user_manager.h" 15 #include "chrome/browser/chromeos/login/users/fake_user_manager.h"
16 #include "chrome/browser/chromeos/ownership/owner_settings_service.h"
17 #include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"
16 #include "chrome/browser/chromeos/policy/device_local_account.h" 18 #include "chrome/browser/chromeos/policy/device_local_account.h"
17 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" 19 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
18 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h" 20 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
19 #include "chrome/common/chrome_paths.h" 21 #include "chrome/common/chrome_paths.h"
20 #include "chrome/test/base/scoped_testing_local_state.h" 22 #include "chrome/test/base/scoped_testing_local_state.h"
21 #include "chrome/test/base/testing_browser_process.h" 23 #include "chrome/test/base/testing_browser_process.h"
22 #include "chrome/test/base/testing_profile.h" 24 #include "chrome/test/base/testing_profile.h"
23 #include "chromeos/settings/cros_settings_names.h" 25 #include "chromeos/settings/cros_settings_names.h"
24 #include "components/user_manager/user.h" 26 #include "components/user_manager/user.h"
25 #include "policy/proto/device_management_backend.pb.h" 27 #include "policy/proto/device_management_backend.pb.h"
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 policy::PolicyBuilder::kFakeUsername); 284 policy::PolicyBuilder::kFakeUsername);
283 entry_dict->SetInteger(kAccountsPrefDeviceLocalAccountsKeyType, 285 entry_dict->SetInteger(kAccountsPrefDeviceLocalAccountsKeyType,
284 policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION); 286 policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION);
285 expected_accounts.Append(entry_dict.release()); 287 expected_accounts.Append(entry_dict.release());
286 const base::Value* actual_accounts = 288 const base::Value* actual_accounts =
287 provider_->Get(kAccountsPrefDeviceLocalAccounts); 289 provider_->Get(kAccountsPrefDeviceLocalAccounts);
288 EXPECT_TRUE(base::Value::Equals(&expected_accounts, actual_accounts)); 290 EXPECT_TRUE(base::Value::Equals(&expected_accounts, actual_accounts));
289 } 291 }
290 292
291 } // namespace chromeos 293 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698