| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| 11 #include "base/files/file_util.h" | 11 #include "base/files/file_util.h" |
| 12 #include "base/lazy_instance.h" | 12 #include "base/lazy_instance.h" |
| 13 #include "base/macros.h" | 13 #include "base/macros.h" |
| 14 #include "base/path_service.h" | 14 #include "base/path_service.h" |
| 15 #include "base/prefs/pref_service.h" | |
| 16 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
| 17 #include "build/build_config.h" | 16 #include "build/build_config.h" |
| 18 #include "chrome/browser/background/background_mode_manager.h" | 17 #include "chrome/browser/background/background_mode_manager.h" |
| 19 #include "chrome/browser/browser_process.h" | 18 #include "chrome/browser/browser_process.h" |
| 20 #include "chrome/browser/content_settings/cookie_settings_factory.h" | 19 #include "chrome/browser/content_settings/cookie_settings_factory.h" |
| 21 #include "chrome/browser/defaults.h" | 20 #include "chrome/browser/defaults.h" |
| 22 #include "chrome/browser/infobars/infobar_service.h" | 21 #include "chrome/browser/infobars/infobar_service.h" |
| 23 #include "chrome/browser/lifetime/application_lifetime.h" | 22 #include "chrome/browser/lifetime/application_lifetime.h" |
| 24 #include "chrome/browser/prefs/session_startup_pref.h" | 23 #include "chrome/browser/prefs/session_startup_pref.h" |
| 25 #include "chrome/browser/profiles/profile.h" | 24 #include "chrome/browser/profiles/profile.h" |
| 26 #include "chrome/browser/profiles/profile_impl.h" | 25 #include "chrome/browser/profiles/profile_impl.h" |
| 27 #include "chrome/browser/profiles/profile_manager.h" | 26 #include "chrome/browser/profiles/profile_manager.h" |
| 28 #include "chrome/browser/sessions/session_restore_test_helper.h" | 27 #include "chrome/browser/sessions/session_restore_test_helper.h" |
| 29 #include "chrome/browser/sessions/session_service_factory.h" | 28 #include "chrome/browser/sessions/session_service_factory.h" |
| 30 #include "chrome/browser/sessions/session_service_test_helper.h" | 29 #include "chrome/browser/sessions/session_service_test_helper.h" |
| 31 #include "chrome/browser/ui/browser.h" | 30 #include "chrome/browser/ui/browser.h" |
| 32 #include "chrome/browser/ui/browser_commands.h" | 31 #include "chrome/browser/ui/browser_commands.h" |
| 33 #include "chrome/browser/ui/browser_list.h" | 32 #include "chrome/browser/ui/browser_list.h" |
| 34 #include "chrome/browser/ui/browser_window.h" | 33 #include "chrome/browser/ui/browser_window.h" |
| 35 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 34 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| 36 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 35 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 37 #include "chrome/common/chrome_switches.h" | 36 #include "chrome/common/chrome_switches.h" |
| 38 #include "chrome/common/pref_names.h" | 37 #include "chrome/common/pref_names.h" |
| 39 #include "chrome/common/url_constants.h" | 38 #include "chrome/common/url_constants.h" |
| 40 #include "chrome/test/base/in_process_browser_test.h" | 39 #include "chrome/test/base/in_process_browser_test.h" |
| 41 #include "chrome/test/base/ui_test_utils.h" | 40 #include "chrome/test/base/ui_test_utils.h" |
| 42 #include "components/content_settings/core/browser/cookie_settings.h" | 41 #include "components/content_settings/core/browser/cookie_settings.h" |
| 43 #include "components/content_settings/core/common/content_settings.h" | 42 #include "components/content_settings/core/common/content_settings.h" |
| 44 #include "components/infobars/core/confirm_infobar_delegate.h" | 43 #include "components/infobars/core/confirm_infobar_delegate.h" |
| 44 #include "components/prefs/pref_service.h" |
| 45 #include "content/public/browser/web_contents.h" | 45 #include "content/public/browser/web_contents.h" |
| 46 #include "content/public/common/url_constants.h" | 46 #include "content/public/common/url_constants.h" |
| 47 #include "content/public/test/browser_test_utils.h" | 47 #include "content/public/test/browser_test_utils.h" |
| 48 #include "net/base/net_util.h" | 48 #include "net/base/net_util.h" |
| 49 #include "net/base/upload_bytes_element_reader.h" | 49 #include "net/base/upload_bytes_element_reader.h" |
| 50 #include "net/base/upload_data_stream.h" | 50 #include "net/base/upload_data_stream.h" |
| 51 #include "net/url_request/url_request.h" | 51 #include "net/url_request/url_request.h" |
| 52 #include "net/url_request/url_request_filter.h" | 52 #include "net/url_request/url_request_filter.h" |
| 53 #include "net/url_request/url_request_interceptor.h" | 53 #include "net/url_request/url_request_interceptor.h" |
| 54 #include "net/url_request/url_request_test_job.h" | 54 #include "net/url_request/url_request_test_job.h" |
| (...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 844 CookieSettingsFactory::GetForProfile(new_browser->profile()) | 844 CookieSettingsFactory::GetForProfile(new_browser->profile()) |
| 845 ->SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY); | 845 ->SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY); |
| 846 // ... even if background mode is active. | 846 // ... even if background mode is active. |
| 847 EnableBackgroundMode(); | 847 EnableBackgroundMode(); |
| 848 new_browser = QuitBrowserAndRestore(new_browser, true); | 848 new_browser = QuitBrowserAndRestore(new_browser, true); |
| 849 StoreDataWithPage(new_browser, "cookies.html"); | 849 StoreDataWithPage(new_browser, "cookies.html"); |
| 850 DisableBackgroundMode(); | 850 DisableBackgroundMode(); |
| 851 new_browser = QuitBrowserAndRestore(new_browser, true); | 851 new_browser = QuitBrowserAndRestore(new_browser, true); |
| 852 StoreDataWithPage(new_browser, "cookies.html"); | 852 StoreDataWithPage(new_browser, "cookies.html"); |
| 853 } | 853 } |
| OLD | NEW |