diff options
Diffstat (limited to 'chrome/test')
-rw-r--r-- | chrome/test/in_process_browser_test.cc | 4 | ||||
-rw-r--r-- | chrome/test/live_sync/bookmark_model_verifier.h | 2 | ||||
-rw-r--r-- | chrome/test/live_sync/live_autofill_sync_test.h | 2 | ||||
-rw-r--r-- | chrome/test/live_sync/live_extensions_sync_test.cc | 2 | ||||
-rw-r--r-- | chrome/test/live_sync/live_extensions_sync_test_base.cc | 2 | ||||
-rw-r--r-- | chrome/test/live_sync/live_passwords_sync_test.h | 2 | ||||
-rw-r--r-- | chrome/test/live_sync/live_preferences_sync_test.h | 2 | ||||
-rw-r--r-- | chrome/test/live_sync/live_sessions_sync_test.h | 2 | ||||
-rw-r--r-- | chrome/test/live_sync/live_sync_test.cc | 4 | ||||
-rw-r--r-- | chrome/test/live_sync/live_themes_sync_test.cc | 2 | ||||
-rw-r--r-- | chrome/test/testing_device_token_fetcher.cc | 2 | ||||
-rw-r--r-- | chrome/test/testing_profile.h | 2 | ||||
-rw-r--r-- | chrome/test/ui_test_utils.cc | 2 |
13 files changed, 15 insertions, 15 deletions
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc index c0711d2..24f9179 100644 --- a/chrome/test/in_process_browser_test.cc +++ b/chrome/test/in_process_browser_test.cc @@ -19,8 +19,8 @@ #include "chrome/browser/intranet_redirect_detector.h" #include "chrome/browser/io_thread.h" #include "chrome/browser/net/url_request_mock_util.h" -#include "chrome/browser/profile.h" -#include "chrome/browser/profile_manager.h" +#include "chrome/browser/profiles/profile.h" +#include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" diff --git a/chrome/test/live_sync/bookmark_model_verifier.h b/chrome/test/live_sync/bookmark_model_verifier.h index 5ba3dd1..0f662d7 100644 --- a/chrome/test/live_sync/bookmark_model_verifier.h +++ b/chrome/test/live_sync/bookmark_model_verifier.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#include "chrome/browser/profile.h" +#include "chrome/browser/profiles/profile.h" #include "googleurl/src/gurl.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/test/live_sync/live_autofill_sync_test.h b/chrome/test/live_sync/live_autofill_sync_test.h index 7f09ce5..192b897 100644 --- a/chrome/test/live_sync/live_autofill_sync_test.h +++ b/chrome/test/live_sync/live_autofill_sync_test.h @@ -17,7 +17,7 @@ #include "chrome/browser/autofill/field_types.h" #include "chrome/browser/autofill/personal_data_manager.h" #include "chrome/browser/prefs/pref_service.h" -#include "chrome/browser/profile.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_test_util.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/test/live_sync/live_extensions_sync_test.cc b/chrome/test/live_sync/live_extensions_sync_test.cc index b4f287a..d937ba0 100644 --- a/chrome/test/live_sync/live_extensions_sync_test.cc +++ b/chrome/test/live_sync/live_extensions_sync_test.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/ref_counted.h" #include "chrome/browser/extensions/extensions_service.h" -#include "chrome/browser/profile.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/test/live_sync/live_extensions_sync_test_base.cc b/chrome/test/live_sync/live_extensions_sync_test_base.cc index ce4396e..ff48581 100644 --- a/chrome/test/live_sync/live_extensions_sync_test_base.cc +++ b/chrome/test/live_sync/live_extensions_sync_test_base.cc @@ -13,7 +13,7 @@ #include "base/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/extensions_service.h" -#include "chrome/browser/profile.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" diff --git a/chrome/test/live_sync/live_passwords_sync_test.h b/chrome/test/live_sync/live_passwords_sync_test.h index e90d276..81fe215 100644 --- a/chrome/test/live_sync/live_passwords_sync_test.h +++ b/chrome/test/live_sync/live_passwords_sync_test.h @@ -8,7 +8,7 @@ #include <set> -#include "chrome/browser/profile.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/password_manager/password_store.h" #include "chrome/test/live_sync/live_sync_test.h" #include "chrome/test/ui_test_utils.h" diff --git a/chrome/test/live_sync/live_preferences_sync_test.h b/chrome/test/live_sync/live_preferences_sync_test.h index 468f21915..f7b8bb2 100644 --- a/chrome/test/live_sync/live_preferences_sync_test.h +++ b/chrome/test/live_sync/live_preferences_sync_test.h @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/prefs/pref_service.h" -#include "chrome/browser/profile.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chrome/test/live_sync/live_sync_test.h" diff --git a/chrome/test/live_sync/live_sessions_sync_test.h b/chrome/test/live_sync/live_sessions_sync_test.h index 06260a2..ce118d5 100644 --- a/chrome/test/live_sync/live_sessions_sync_test.h +++ b/chrome/test/live_sync/live_sessions_sync_test.h @@ -15,7 +15,7 @@ #include "base/waitable_event.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_window.h" -#include "chrome/browser/profile.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" #include "chrome/browser/sessions/base_session_service.h" #include "chrome/browser/sessions/session_service_test_helper.h" diff --git a/chrome/test/live_sync/live_sync_test.cc b/chrome/test/live_sync/live_sync_test.cc index fa8bcf2..6adba5c 100644 --- a/chrome/test/live_sync/live_sync_test.cc +++ b/chrome/test/live_sync/live_sync_test.cc @@ -19,8 +19,8 @@ #include "base/waitable_event.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/password_manager/encryptor.h" -#include "chrome/browser/profile.h" -#include "chrome/browser/profile_manager.h" +#include "chrome/browser/profiles/profile.h" +#include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/net/url_fetcher.h" diff --git a/chrome/test/live_sync/live_themes_sync_test.cc b/chrome/test/live_sync/live_themes_sync_test.cc index a92d898..cca60c4 100644 --- a/chrome/test/live_sync/live_themes_sync_test.cc +++ b/chrome/test/live_sync/live_themes_sync_test.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "chrome/browser/extensions/extensions_service.h" -#include "chrome/browser/profile.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/test/testing_device_token_fetcher.cc b/chrome/test/testing_device_token_fetcher.cc index ed491e1..263f47a 100644 --- a/chrome/test/testing_device_token_fetcher.cc +++ b/chrome/test/testing_device_token_fetcher.cc @@ -8,7 +8,7 @@ #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" #include "chrome/browser/policy/device_token_fetcher.h" -#include "chrome/browser/profile.h" +#include "chrome/browser/profiles/profile.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/login/user_manager.h" diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index d08cafd..6e6b6b4 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -10,7 +10,7 @@ #include "base/scoped_ptr.h" #include "base/scoped_temp_dir.h" #include "base/timer.h" -#include "chrome/browser/profile.h" +#include "chrome/browser/profiles/profile.h" namespace history { class TopSites; diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc index e96860d..bf4d9dc 100644 --- a/chrome/test/ui_test_utils.cc +++ b/chrome/test/ui_test_utils.cc @@ -23,7 +23,7 @@ #include "chrome/browser/dom_operation_notification_details.h" #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_manager.h" -#include "chrome/browser/profile.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/navigation_controller.h" |