chrome/browser/sessions/session_service_unittest.cc - Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/

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_service_unittest.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

« no previous file with comments | « chrome/browser/sessions/session_backend_unittest.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/bind.h"	5 #include "base/bind.h"

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

7 #include "base/file_util.h"	7 #include "base/files/file_util.h"

8 #include "base/files/scoped_temp_dir.h"	8 #include "base/files/scoped_temp_dir.h"

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

10 #include "base/memory/scoped_vector.h"	10 #include "base/memory/scoped_vector.h"

11 #include "base/path_service.h"	11 #include "base/path_service.h"

12 #include "base/stl_util.h"	12 #include "base/stl_util.h"

13 #include "base/strings/string_number_conversions.h"	13 #include "base/strings/string_number_conversions.h"

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

15 #include "base/time/time.h"	15 #include "base/time/time.h"

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

17 #include "chrome/browser/chrome_notification_types.h"	17 #include "chrome/browser/chrome_notification_types.h"

(...skipping 974 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
992	992

993 ASSERT_EQ(1U, windows.size());	993 ASSERT_EQ(1U, windows.size());

994 ASSERT_EQ(0, windows[0]->selected_tab_index);	994 ASSERT_EQ(0, windows[0]->selected_tab_index);

995 ASSERT_EQ(window_id.id(), windows[0]->window_id.id());	995 ASSERT_EQ(window_id.id(), windows[0]->window_id.id());

996 ASSERT_EQ(1U, windows[0]->tabs.size());	996 ASSERT_EQ(1U, windows[0]->tabs.size());

997	997

998 SessionTab* tab = windows[0]->tabs[0];	998 SessionTab* tab = windows[0]->tabs[0];

999 helper_.AssertTabEquals(window_id, tab_id, 0, 0, 1, *tab);	999 helper_.AssertTabEquals(window_id, tab_id, 0, 0, 1, *tab);

1000 helper_.AssertNavigationEquals(nav1, tab->navigations[0]);	1000 helper_.AssertNavigationEquals(nav1, tab->navigations[0]);

1001 }	1001 }

OLD	NEW