diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 21:45:13 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 21:45:13 +0000 |
| commit | 7688968ab79b197fd10e02dc634508e19626c663 (patch) | |
| tree | 8d8d171caff63444a5bacca1021231087d6f0aea /chrome/browser/chromeos/settings | |
| parent | 48ef98e49cb27ca0eb4e6b97b16a25178b4957c3 (diff) | |
| download | chromium_src-7688968ab79b197fd10e02dc634508e19626c663.zip chromium_src-7688968ab79b197fd10e02dc634508e19626c663.tar.gz chromium_src-7688968ab79b197fd10e02dc634508e19626c663.tar.bz2 | |
Split testing_pref_service.h/.cc into two parts, generic vs. Chrome-specific.
TBR=ben@chromium.org
BUG=155525
Review URL: https://chromiumcodereview.appspot.com/12223091
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182026 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/settings')
| -rw-r--r-- | chrome/browser/chromeos/settings/cros_settings_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/chromeos/settings/device_settings_provider_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/settings/cros_settings_unittest.cc b/chrome/browser/chromeos/settings/cros_settings_unittest.cc index 9c43c42..5e70414 100644 --- a/chrome/browser/chromeos/settings/cros_settings_unittest.cc +++ b/chrome/browser/chromeos/settings/cros_settings_unittest.cc @@ -17,8 +17,8 @@ #include "chrome/browser/policy/cloud_policy_constants.h" #include "chrome/browser/policy/proto/chrome_device_policy.pb.h" #include "chrome/browser/policy/proto/device_management_backend.pb.h" +#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" -#include "chrome/test/base/testing_pref_service.h" #include "content/public/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc index f316153..371696e 100644 --- a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc +++ b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc @@ -18,8 +18,8 @@ #include "chrome/browser/policy/proto/chrome_device_policy.pb.h" #include "chrome/browser/policy/proto/device_management_backend.pb.h" #include "chrome/common/chrome_paths.h" +#include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" -#include "chrome/test/base/testing_pref_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" |