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

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

Issue 108563005: Move the cloud policy protobufs into the component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years 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/settings/device_settings_service.h" 5 #include "chrome/browser/chromeos/settings/device_settings_service.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
11 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h" 12 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
12 #include "chrome/browser/policy/proto/chromeos/chrome_device_policy.pb.h" 13 #include "policy/proto/device_management_backend.pb.h"
13 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
14 #include "testing/gmock/include/gmock/gmock.h" 14 #include "testing/gmock/include/gmock/gmock.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 namespace em = enterprise_management; 17 namespace em = enterprise_management;
18 18
19 using ::testing::Mock; 19 using ::testing::Mock;
20 20
21 namespace chromeos { 21 namespace chromeos {
22 22
23 namespace { 23 namespace {
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0); 483 EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0);
484 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1); 484 EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1);
485 device_settings_service_.PropertyChangeComplete(true); 485 device_settings_service_.PropertyChangeComplete(true);
486 FlushDeviceSettings(); 486 FlushDeviceSettings();
487 Mock::VerifyAndClearExpectations(&observer_); 487 Mock::VerifyAndClearExpectations(&observer_);
488 488
489 device_settings_service_.RemoveObserver(&observer_); 489 device_settings_service_.RemoveObserver(&observer_);
490 } 490 }
491 491
492 } // namespace chromeos 492 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698