diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-11 17:15:57 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-11 17:15:57 +0000 |
| commit | 3853a4c9eb39968834334c349ffb801c5672df60 (patch) | |
| tree | 1eb65ffc95ea791b0fd019f1ffc26056b645fde2 /chrome_frame | |
| parent | c172ec86f0856f2355d879693942eb370b34b294 (diff) | |
| download | chromium_src-3853a4c9eb39968834334c349ffb801c5672df60.zip chromium_src-3853a4c9eb39968834334c349ffb801c5672df60.tar.gz chromium_src-3853a4c9eb39968834334c349ffb801c5672df60.tar.bz2 | |
Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.
This is a mostly-automated change, using
./tools/git/move_source_file.py to move files and fix up include
guards and #includes from other files. Manual edits were limited to
fixing up .gypi files and adding BASE_PREFS_EXPORT where needed.
TBR=ben@chromium.org
BUG=155525
Review URL: https://codereview.chromium.org/12211105
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 4 | ||||
| -rw-r--r-- | chrome_frame/test/reliability/page_load_test.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 1f0f5df..21a0b34 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -20,6 +20,8 @@ #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/prefs/json_pref_store.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" #include "base/string_piece.h" #include "base/string_util.h" #include "base/stringprintf.h" @@ -33,8 +35,6 @@ #include "chrome/browser/automation/automation_provider_list.h" #include "chrome/browser/chrome_content_browser_client.h" #include "chrome/browser/prefs/browser_prefs.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" #include "chrome/browser/process_singleton.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index f3f4c9e5..f281d20 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/chrome_frame/test/reliability/page_load_test.cc @@ -29,16 +29,16 @@ #include "base/i18n/time_formatting.h" #include "base/path_service.h" #include "base/prefs/json_pref_store.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" +#include "base/prefs/pref_value_store.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/test/test_file_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/net/url_fixer_upper.h" -#include "chrome/browser/prefs/pref_registry_simple.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_service_mock_builder.h" -#include "chrome/browser/prefs/pref_value_store.h" #include "chrome/common/automation_messages.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" |