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

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

Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 years, 4 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/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/message_loop.h" 10 #include "base/message_loop.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/chromeos/cros/cros_library.h" 12 #include "chrome/browser/chromeos/cros/cros_library.h"
13 #include "chrome/browser/chromeos/cros_settings_names.h"
14 #include "chrome/browser/chromeos/login/mock_signed_settings_helper.h"
15 #include "chrome/browser/chromeos/login/mock_user_manager.h" 13 #include "chrome/browser/chromeos/login/mock_user_manager.h"
16 #include "chrome/browser/chromeos/login/ownership_service.h" 14 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
15 #include "chrome/browser/chromeos/settings/mock_signed_settings_helper.h"
16 #include "chrome/browser/chromeos/settings/ownership_service.h"
17 #include "chrome/browser/policy/proto/chrome_device_policy.pb.h" 17 #include "chrome/browser/policy/proto/chrome_device_policy.pb.h"
18 #include "chrome/browser/policy/proto/device_management_backend.pb.h" 18 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
19 #include "chrome/test/base/testing_browser_process.h" 19 #include "chrome/test/base/testing_browser_process.h"
20 #include "chrome/test/base/testing_pref_service.h" 20 #include "chrome/test/base/testing_pref_service.h"
21 #include "content/public/test/test_browser_thread.h" 21 #include "content/public/test/test_browser_thread.h"
22 #include "testing/gmock/include/gmock/gmock.h" 22 #include "testing/gmock/include/gmock/gmock.h"
23 #include "testing/gtest/include/gtest/gtest.h" 23 #include "testing/gtest/include/gtest/gtest.h"
24 24
25 namespace em = enterprise_management; 25 namespace em = enterprise_management;
26 namespace chromeos { 26 namespace chromeos {
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 provider_->set_trusted_status(CrosSettingsProvider::TEMPORARILY_UNTRUSTED); 248 provider_->set_trusted_status(CrosSettingsProvider::TEMPORARILY_UNTRUSTED);
249 EXPECT_CALL(*this, GetTrustedCallback()); 249 EXPECT_CALL(*this, GetTrustedCallback());
250 EXPECT_EQ(CrosSettingsProvider::TEMPORARILY_UNTRUSTED, 250 EXPECT_EQ(CrosSettingsProvider::TEMPORARILY_UNTRUSTED,
251 provider_->PrepareTrustedValues( 251 provider_->PrepareTrustedValues(
252 base::Bind(&DeviceSettingsProviderTest::GetTrustedCallback, 252 base::Bind(&DeviceSettingsProviderTest::GetTrustedCallback,
253 base::Unretained(this)))); 253 base::Unretained(this))));
254 provider_->Reload(); 254 provider_->Reload();
255 } 255 }
256 256
257 } // namespace chromeos 257 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/settings/device_settings_provider.cc ('k') | chrome/browser/chromeos/settings/mock_owner_key_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698