diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-19 00:34:25 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-19 00:34:25 +0000 |
| commit | 2f69b38816cc86ffff8c255a6984376e2aa02c10 (patch) | |
| tree | f02519424110456ccda1563e9bee6e32aa78fc56 /chrome/test/testing_profile.cc | |
| parent | 7b398be3d0a34cb44dff6c45a6842f4ab4c1116e (diff) | |
| download | chromium_src-2f69b38816cc86ffff8c255a6984376e2aa02c10.zip chromium_src-2f69b38816cc86ffff8c255a6984376e2aa02c10.tar.gz chromium_src-2f69b38816cc86ffff8c255a6984376e2aa02c10.tar.bz2 | |
Reland "WebUI: Move more files from chrome/browser/dom_ui to chrome/browser/webui. Part 5."
This reverts commit 1088003ee7026f2b830d2451f79ce772c44a7cea.
BUG=59945, 59946
TEST=trybots
TBR=avi@chromium.org
Original Review: http://codereview.chromium.org/6538053/
Review URL: http://codereview.chromium.org/6532069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75478 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/testing_profile.cc')
| -rw-r--r-- | chrome/test/testing_profile.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc index 3839847..9d72599 100644 --- a/chrome/test/testing_profile.cc +++ b/chrome/test/testing_profile.cc @@ -16,10 +16,9 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/content_settings/host_content_settings_map.h" -#include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/dom_ui/ntp_resource_cache.h" -#include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_pref_value_map.h" +#include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/favicon_service.h" #include "chrome/browser/geolocation/geolocation_content_settings_map.h" #include "chrome/browser/geolocation/geolocation_permission_context.h" @@ -38,6 +37,7 @@ #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/find_bar/find_bar_state.h" +#include "chrome/browser/webui/chrome_url_data_manager.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/net/url_request_context_getter.h" #include "chrome/common/notification_service.h" |