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

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

Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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" 6 #include "base/file_util.h"
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.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/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/chromeos/enterprise_extension_observer.h" 13 #include "chrome/browser/chromeos/enterprise_extension_observer.h"
14 #include "chrome/browser/content_settings/cookie_settings.h" 14 #include "chrome/browser/content_settings/cookie_settings.h"
15 #include "chrome/browser/infobars/confirm_infobar_delegate.h" 15 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
16 #include "chrome/browser/infobars/infobar_service.h" 16 #include "chrome/browser/infobars/infobar_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"
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY); 524 SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY);
525 } 525 }
526 526
527 IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, CookiesClearedOnExit) { 527 IN_PROC_BROWSER_TEST_F(NoSessionRestoreTest, CookiesClearedOnExit) {
528 content::WebContents* web_contents = 528 content::WebContents* web_contents =
529 browser()->tab_strip_model()->GetActiveWebContents(); 529 browser()->tab_strip_model()->GetActiveWebContents();
530 EXPECT_EQ(std::string(content::kAboutBlankURL), 530 EXPECT_EQ(std::string(content::kAboutBlankURL),
531 web_contents->GetURL().spec()); 531 web_contents->GetURL().spec());
532 StoreDataWithPage("local_storage.html"); 532 StoreDataWithPage("local_storage.html");
533 } 533 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698