chrome/browser/extensions/extension_webui_apitest.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/extensions/extension_webui_apitest.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/extensions/extension_startup_browsertest.cc ('k') | chrome/browser/extensions/external_pref_loader.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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"

6 #include "base/files/file_path.h"	5 #include "base/files/file_path.h"

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

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

8 #include "base/values.h"	8 #include "base/values.h"

9 #include "chrome/browser/extensions/extension_apitest.h"	9 #include "chrome/browser/extensions/extension_apitest.h"

10 #include "chrome/browser/extensions/extension_test_message_listener.h"	10 #include "chrome/browser/extensions/extension_test_message_listener.h"

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

12 #include "chrome/browser/ui/tabs/tab_strip_model.h"	12 #include "chrome/browser/ui/tabs/tab_strip_model.h"

13 #include "chrome/common/chrome_paths.h"	13 #include "chrome/common/chrome_paths.h"

14 #include "chrome/test/base/ui_test_utils.h"	14 #include "chrome/test/base/ui_test_utils.h"

15 #include "content/public/browser/render_frame_host.h"	15 #include "content/public/browser/render_frame_host.h"

16 #include "content/public/browser/web_contents.h"	16 #include "content/public/browser/web_contents.h"

(...skipping 220 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
237	237

238 ASSERT_TRUE(listener->WaitUntilSatisfied());	238 ASSERT_TRUE(listener->WaitUntilSatisfied());

239 listener->Reply(extension->id());	239 listener->Reply(extension->id());

240 listener.reset(new ExtensionTestMessageListener("onclose received", false));	240 listener.reset(new ExtensionTestMessageListener("onclose received", false));

241 ASSERT_TRUE(listener->WaitUntilSatisfied());	241 ASSERT_TRUE(listener->WaitUntilSatisfied());

242 }	242 }

243	243

244 } // namespace	244 } // namespace

245	245

246 } // namespace extensions	246 } // namespace extensions

OLD	NEW