Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(431)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/sessions/better_session_restore_browsertest.cc

Issue 541813002: Componentize chrome/common/content_settings files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: OWNERS Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« chrome/DEPS ('K') | « chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc ('k') | chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc » ('j') | components/content_settings/core/common/DEPS » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/sessions/session_backend.h" 23 #include "chrome/browser/sessions/session_backend.h"
24 #include "chrome/browser/sessions/session_service_factory.h" 24 #include "chrome/browser/sessions/session_service_factory.h"
25 #include "chrome/browser/sessions/session_service_test_helper.h" 25 #include "chrome/browser/sessions/session_service_test_helper.h"
26 #include "chrome/browser/ui/browser.h" 26 #include "chrome/browser/ui/browser.h"
27 #include "chrome/browser/ui/browser_commands.h" 27 #include "chrome/browser/ui/browser_commands.h"
28 #include "chrome/browser/ui/browser_iterator.h" 28 #include "chrome/browser/ui/browser_iterator.h"
29 #include "chrome/browser/ui/browser_window.h" 29 #include "chrome/browser/ui/browser_window.h"
30 #include "chrome/browser/ui/startup/startup_browser_creator.h" 30 #include "chrome/browser/ui/startup/startup_browser_creator.h"
31 #include "chrome/browser/ui/tabs/tab_strip_model.h" 31 #include "chrome/browser/ui/tabs/tab_strip_model.h"
32 #include "chrome/common/chrome_switches.h" 32 #include "chrome/common/chrome_switches.h"
33 #include "chrome/common/content_settings.h"
34 #include "chrome/common/pref_names.h" 33 #include "chrome/common/pref_names.h"
35 #include "chrome/common/url_constants.h" 34 #include "chrome/common/url_constants.h"
36 #include "chrome/test/base/in_process_browser_test.h" 35 #include "chrome/test/base/in_process_browser_test.h"
37 #include "chrome/test/base/ui_test_utils.h" 36 #include "chrome/test/base/ui_test_utils.h"
37 #include "components/content_settings/core/common/content_settings.h"
38 #include "components/infobars/core/confirm_infobar_delegate.h" 38 #include "components/infobars/core/confirm_infobar_delegate.h"
39 #include "content/public/browser/web_contents.h" 39 #include "content/public/browser/web_contents.h"
40 #include "content/public/common/url_constants.h" 40 #include "content/public/common/url_constants.h"
41 #include "content/public/test/browser_test_utils.h" 41 #include "content/public/test/browser_test_utils.h"
42 #include "net/base/net_util.h" 42 #include "net/base/net_util.h"
43 #include "net/base/upload_bytes_element_reader.h" 43 #include "net/base/upload_bytes_element_reader.h"
44 #include "net/base/upload_data_stream.h" 44 #include "net/base/upload_data_stream.h"
45 #include "net/url_request/url_request.h" 45 #include "net/url_request/url_request.h"
46 #include "net/url_request/url_request_filter.h" 46 #include "net/url_request/url_request_filter.h"
47 #include "net/url_request/url_request_test_job.h" 47 #include "net/url_request/url_request_test_job.h"
(...skipping 784 matching lines...) Expand 10 before | Expand all | Expand 10 after
832 CookieSettings::Factory::GetForProfile(new_browser->profile())-> 832 CookieSettings::Factory::GetForProfile(new_browser->profile())->
833 SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY); 833 SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY);
834 // ... even if background mode is active. 834 // ... even if background mode is active.
835 EnableBackgroundMode(); 835 EnableBackgroundMode();
836 new_browser = QuitBrowserAndRestore(new_browser, true); 836 new_browser = QuitBrowserAndRestore(new_browser, true);
837 StoreDataWithPage(new_browser, "cookies.html"); 837 StoreDataWithPage(new_browser, "cookies.html");
838 DisableBackgroundMode(); 838 DisableBackgroundMode();
839 new_browser = QuitBrowserAndRestore(new_browser, true); 839 new_browser = QuitBrowserAndRestore(new_browser, true);
840 StoreDataWithPage(new_browser, "cookies.html"); 840 StoreDataWithPage(new_browser, "cookies.html");
841 } 841 }
OLDNEW
« chrome/DEPS ('K') | « chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc ('k') | chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc » ('j') | components/content_settings/core/common/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698