diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-26 00:22:02 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-26 00:22:02 +0000 |
| commit | 37858e5c2f58f4b46117c65df2ab3da8a7b2e6e2 (patch) | |
| tree | f3acb53adbd2d0ffe5e113d6c057fdee9bcc6dcd /chrome_frame | |
| parent | feecbf07dbc4b4c94dceb5e0043889126d213f6e (diff) | |
| download | chromium_src-37858e5c2f58f4b46117c65df2ab3da8a7b2e6e2.zip chromium_src-37858e5c2f58f4b46117c65df2ab3da8a7b2e6e2.tar.gz chromium_src-37858e5c2f58f4b46117c65df2ab3da8a7b2e6e2.tar.bz2 | |
Move prefs-related files under chrome/browser/ into a prefs/ subdir.
Rename includes, resort header include order in places where the rename
changed the order.
BUG=50548
TEST=compiles
Review URL: http://codereview.chromium.org/3203008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 8 | ||||
| -rw-r--r-- | chrome_frame/test/reliability/page_load_test.cc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 64899d8..b42b13b 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -20,9 +20,9 @@ #include "base/scoped_comptr_win.h" #include "base/string_util.h" #include "chrome/browser/automation/automation_provider_list.h" -#include "chrome/browser/browser_prefs.h" #include "chrome/browser/plugin_service.h" -#include "chrome/browser/pref_service.h" +#include "chrome/browser/prefs/browser_prefs.h" +#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/process_singleton.h" #include "chrome/browser/profile_manager.h" #include "chrome/browser/renderer_host/render_process_host.h" @@ -33,11 +33,11 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" -#include "chrome_frame/utils.h" #include "chrome_frame/test/chrome_frame_test_utils.h" +#include "chrome_frame/test/net/test_automation_resource_message_filter.h" #include "chrome_frame/test/simulate_input.h" #include "chrome_frame/test/win_event_receiver.h" -#include "chrome_frame/test/net/test_automation_resource_message_filter.h" +#include "chrome_frame/utils.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index 5ca959a..ed6f1d9 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/chrome_frame/test/reliability/page_load_test.cc @@ -37,8 +37,8 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/net/url_fixer_upper.h" -#include "chrome/browser/pref_service.h" -#include "chrome/browser/pref_value_store.h" +#include "chrome/browser/prefs/pref_service.h" +#include "chrome/browser/prefs/pref_value_store.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths_internal.h" |