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

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

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge 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 | Annotate | Revision Log
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/file_util.h"
7 #include "base/files/file_path.h" 6 #include "base/files/file_path.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"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "chrome/browser/background/background_mode_manager.h" 12 #include "chrome/browser/background/background_mode_manager.h"
13 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/chrome_notification_types.h" 14 #include "chrome/browser/chrome_notification_types.h"
15 #include "chrome/browser/content_settings/cookie_settings.h" 15 #include "chrome/browser/content_settings/cookie_settings.h"
16 #include "chrome/browser/defaults.h" 16 #include "chrome/browser/defaults.h"
17 #include "chrome/browser/infobars/infobar_service.h" 17 #include "chrome/browser/infobars/infobar_service.h"
(...skipping 814 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
« no previous file with comments | « chrome/browser/search_engines/template_url_parser_unittest.cc ('k') | chrome/browser/sessions/session_backend.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698