chrome/browser/sessions/session_restore_browsertest.cc - Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/sessions/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

« no previous file with comments | « chrome/browser/sessions/persistent_tab_restore_service_browsertest.cc ('k') | chrome/browser/sessions/session_service_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/files/file_path.h"	6 #include "base/files/file_path.h"

	7 #include "base/strings/utf_string_conversions.h"

7 #include "base/time.h"	8 #include "base/time.h"

8 #include "base/utf_string_conversions.h"

9 #include "chrome/browser/browser_process.h"	9 #include "chrome/browser/browser_process.h"

10 #include "chrome/browser/defaults.h"	10 #include "chrome/browser/defaults.h"

11 #include "chrome/browser/first_run/first_run.h"	11 #include "chrome/browser/first_run/first_run.h"

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

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

14 #include "chrome/browser/sessions/session_restore.h"	14 #include "chrome/browser/sessions/session_restore.h"

15 #include "chrome/browser/sessions/session_service.h"	15 #include "chrome/browser/sessions/session_service.h"

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

17 #include "chrome/browser/sessions/session_service_test_helper.h"	17 #include "chrome/browser/sessions/session_service_test_helper.h"

18 #include "chrome/browser/sessions/session_types.h"	18 #include "chrome/browser/sessions/session_types.h"

(...skipping 1099 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1118 content::NavigationController* controller =	1118 content::NavigationController* controller =

1119 &browser()->tab_strip_model()->GetActiveWebContents()->GetController();	1119 &browser()->tab_strip_model()->GetActiveWebContents()->GetController();

1120 EXPECT_TRUE(	1120 EXPECT_TRUE(

1121 controller->GetDefaultSessionStorageNamespace()->should_persist());	1121 controller->GetDefaultSessionStorageNamespace()->should_persist());

1122	1122

1123 // Quit and restore. Check that no extra tabs were created.	1123 // Quit and restore. Check that no extra tabs were created.

1124 Browser* new_browser = QuitBrowserAndRestore(browser(), 1);	1124 Browser* new_browser = QuitBrowserAndRestore(browser(), 1);

1125 ASSERT_EQ(1u, native_browser_list->size());	1125 ASSERT_EQ(1u, native_browser_list->size());

1126 EXPECT_EQ(1, new_browser->tab_strip_model()->count());	1126 EXPECT_EQ(1, new_browser->tab_strip_model()->count());

1127 }	1127 }

OLD	NEW