diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 15:08:33 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 15:08:33 +0000 |
| commit | b6e695a9c6fa185592c01bd16fcbd7b95296e571 (patch) | |
| tree | 10349ec3142cca9f7dcb01f6d519c7964a90d899 /chrome/browser/prefs | |
| parent | 8373335453c1100bcaa43f070b30a00217bd3216 (diff) | |
| download | chromium_src-b6e695a9c6fa185592c01bd16fcbd7b95296e571.zip chromium_src-b6e695a9c6fa185592c01bd16fcbd7b95296e571.tar.gz chromium_src-b6e695a9c6fa185592c01bd16fcbd7b95296e571.tar.bz2 | |
Move observers to ConfigurationPolicyProvider.
Share more code for ConfigurationPolicyProviders at the base class.
Removed the DummyConfigurationPolicyProvider.
Removed the DummyCloudPolicyProvider.
Moved ApplyPolicyValueTree to PolicyMap.
BUG=chromium-os:17309
TEST=Everything works as before
Review URL: http://codereview.chromium.org/8059029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/pref_value_store_unittest.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/browser/prefs/pref_value_store_unittest.cc b/chrome/browser/prefs/pref_value_store_unittest.cc index 85a8c14..f368a38 100644 --- a/chrome/browser/prefs/pref_value_store_unittest.cc +++ b/chrome/browser/prefs/pref_value_store_unittest.cc @@ -2,26 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <set> #include <string> +#include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" -#include "chrome/browser/policy/configuration_policy_pref_store.h" -#include "chrome/browser/policy/dummy_configuration_policy_provider.h" #include "chrome/browser/prefs/pref_model_associator.h" #include "chrome/browser/prefs/pref_notifier.h" #include "chrome/browser/prefs/pref_value_store.h" #include "chrome/browser/prefs/testing_pref_store.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -using testing::_; -using testing::AnyNumber; using testing::Mock; -using testing::Invoke; +using testing::_; namespace { |