diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-14 17:20:19 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-14 17:20:19 +0000 |
| commit | e5ba874f019eb505a048ffb38aadf8bb5f495d7f (patch) | |
| tree | cd845816e0959333555fc883d2fac49e3374fecc /chrome/browser/content_settings | |
| parent | ad694eb0fddfdbcb74e31d13e473ce277c680ca8 (diff) | |
| download | chromium_src-e5ba874f019eb505a048ffb38aadf8bb5f495d7f.zip chromium_src-e5ba874f019eb505a048ffb38aadf8bb5f495d7f.tar.gz chromium_src-e5ba874f019eb505a048ffb38aadf8bb5f495d7f.tar.bz2 | |
Moving last generic Prefs implementation files to base/prefs/.
This completes componentization of Prefs, although there are some
remaining TODOs that were created during componentization and
interface improvement that still need to be tackled.
TBR=ben@chromium.org
BUG=155525
Review URL: https://chromiumcodereview.appspot.com/12253004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings')
| -rw-r--r-- | chrome/browser/content_settings/content_settings_default_provider_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/content_settings/content_settings_default_provider_unittest.cc b/chrome/browser/content_settings/content_settings_default_provider_unittest.cc index d636bfb..f5404be 100644 --- a/chrome/browser/content_settings/content_settings_default_provider_unittest.cc +++ b/chrome/browser/content_settings/content_settings_default_provider_unittest.cc @@ -5,11 +5,11 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/prefs/pref_service.h" +#include "base/prefs/testing_pref_service.h" #include "chrome/browser/content_settings/content_settings_default_provider.h" #include "chrome/browser/content_settings/content_settings_mock_observer.h" #include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/common/pref_names.h" -#include "chrome/test/base/testing_pref_service.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" #include "googleurl/src/gurl.h" |