chrome/browser/ui/find_bar/find_bar_host_browsertest.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/ui/find_bar/find_bar_host_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

« no previous file with comments | « chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm ('k') | chrome/browser/ui/libgtk2ui/app_indicator_icon.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/file_util.h"	5 #include "base/files/file_util.h"

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

7 #include "base/prefs/pref_service.h"	7 #include "base/prefs/pref_service.h"

8 #include "base/strings/string16.h"	8 #include "base/strings/string16.h"

9 #include "base/strings/string_util.h"	9 #include "base/strings/string_util.h"

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

11 #include "chrome/app/chrome_command_ids.h"	11 #include "chrome/app/chrome_command_ids.h"

12 #include "chrome/browser/history/history_service.h"	12 #include "chrome/browser/history/history_service.h"

13 #include "chrome/browser/history/history_service_factory.h"	13 #include "chrome/browser/history/history_service_factory.h"

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

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

(...skipping 1529 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1545	1545

1546 EXPECT_TRUE(chrome::ExecuteCommand(browser_incognito, IDC_FIND_NEXT));	1546 EXPECT_TRUE(chrome::ExecuteCommand(browser_incognito, IDC_FIND_NEXT));

1547 WebContents* web_contents_incognito =	1547 WebContents* web_contents_incognito =

1548 browser_incognito->tab_strip_model()->GetActiveWebContents();	1548 browser_incognito->tab_strip_model()->GetActiveWebContents();

1549 ui_test_utils::FindInPageNotificationObserver observer(	1549 ui_test_utils::FindInPageNotificationObserver observer(

1550 web_contents_incognito);	1550 web_contents_incognito);

1551 observer.Wait();	1551 observer.Wait();

1552 EXPECT_EQ(ASCIIToUTF16("bar"),	1552 EXPECT_EQ(ASCIIToUTF16("bar"),

1553 GetFindBarTextForBrowser(browser_incognito));	1553 GetFindBarTextForBrowser(browser_incognito));

1554 }	1554 }

OLD	NEW