chrome/browser/sessions/better_session_restore_browsertest.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

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

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/search_engines/util.cc ('k') | chrome/browser/shell_integration.cc » ('j') | no next file with comments »

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 "base/command_line.h"	5 #include "base/command_line.h"

6 #include "base/file_path.h"	6 #include "base/file_path.h"

7 #include "base/file_util.h"	7 #include "base/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/utf_string_conversions.h"	11 #include "base/utf_string_conversions.h"

11 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"	12 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"

12 #include "chrome/browser/api/infobars/infobar_service.h"	13 #include "chrome/browser/api/infobars/infobar_service.h"

13 #include "chrome/browser/browser_process.h"	14 #include "chrome/browser/browser_process.h"

14 #include "chrome/browser/chromeos/enterprise_extension_observer.h"	15 #include "chrome/browser/chromeos/enterprise_extension_observer.h"

15 #include "chrome/browser/content_settings/cookie_settings.h"	16 #include "chrome/browser/content_settings/cookie_settings.h"

16 #include "chrome/browser/prefs/pref_service.h"

17 #include "chrome/browser/prefs/session_startup_pref.h"	17 #include "chrome/browser/prefs/session_startup_pref.h"

18 #include "chrome/browser/profiles/profile.h"	18 #include "chrome/browser/profiles/profile.h"

19 #include "chrome/browser/profiles/profile_impl.h"	19 #include "chrome/browser/profiles/profile_impl.h"

20 #include "chrome/browser/profiles/profile_manager.h"	20 #include "chrome/browser/profiles/profile_manager.h"

21 #include "chrome/browser/sessions/session_backend.h"	21 #include "chrome/browser/sessions/session_backend.h"

22 #include "chrome/browser/sessions/session_service_factory.h"	22 #include "chrome/browser/sessions/session_service_factory.h"

23 #include "chrome/browser/ui/browser.h"	23 #include "chrome/browser/ui/browser.h"

24 #include "chrome/browser/ui/browser_commands.h"	24 #include "chrome/browser/ui/browser_commands.h"

25 #include "chrome/browser/ui/browser_list.h"	25 #include "chrome/browser/ui/browser_list.h"

26 #include "chrome/browser/ui/browser_window.h"	26 #include "chrome/browser/ui/browser_window.h"

(...skipping 570 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
597 }	597 }

598	598

599 private:	599 private:

600 DISALLOW_COPY_AND_ASSIGN(BetterSessionRestoreCrashTest);	600 DISALLOW_COPY_AND_ASSIGN(BetterSessionRestoreCrashTest);

601 };	601 };

602	602

603 // http://crbug.com/172770	603 // http://crbug.com/172770

604 IN_PROC_BROWSER_TEST_F(BetterSessionRestoreCrashTest, DISABLED_SessionCookies) {	604 IN_PROC_BROWSER_TEST_F(BetterSessionRestoreCrashTest, DISABLED_SessionCookies) {

605 CrashTestWithPage("session_cookies.html");	605 CrashTestWithPage("session_cookies.html");

606 }	606 }

OLD	NEW