chrome/browser/extensions/api/log_private/log_private_apitest_chromeos.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/api/log_private/log_private_apitest_chromeos.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/api/image_writer_private/write_from_url_operation.cc ('k') | chrome/browser/extensions/api/media_galleries/media_galleries_apitest.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 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 <string>	5 #include <string>

6	6

7 #include "base/file_util.h"

8 #include "base/files/file_path.h"	7 #include "base/files/file_path.h"

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

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

10 #include "chrome/common/chrome_switches.h"	10 #include "chrome/common/chrome_switches.h"

11 #include "chromeos/dbus/fake_dbus_thread_manager.h"	11 #include "chromeos/dbus/fake_dbus_thread_manager.h"

12 #include "chromeos/dbus/fake_debug_daemon_client.h"	12 #include "chromeos/dbus/fake_debug_daemon_client.h"

13 #include "content/public/browser/browser_thread.h"	13 #include "content/public/browser/browser_thread.h"

14 #include "extensions/common/extension_builder.h"	14 #include "extensions/common/extension_builder.h"

15 #include "net/dns/mock_host_resolver.h"	15 #include "net/dns/mock_host_resolver.h"

16 #include "net/test/embedded_test_server/embedded_test_server.h"	16 #include "net/test/embedded_test_server/embedded_test_server.h"

17 #include "net/test/embedded_test_server/http_request.h"	17 #include "net/test/embedded_test_server/http_request.h"

18 #include "net/test/embedded_test_server/http_response.h"	18 #include "net/test/embedded_test_server/http_response.h"

(...skipping 76 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
95 // Setup dummy HTTP server.	95 // Setup dummy HTTP server.

96 host_resolver()->AddRule("www.test.com", "127.0.0.1");	96 host_resolver()->AddRule("www.test.com", "127.0.0.1");

97 ASSERT_TRUE(StartEmbeddedTestServer());	97 ASSERT_TRUE(StartEmbeddedTestServer());

98 embedded_test_server()->RegisterRequestHandler(	98 embedded_test_server()->RegisterRequestHandler(

99 base::Bind(&LogPrivateApiTest::HandleRequest, base::Unretained(this)));	99 base::Bind(&LogPrivateApiTest::HandleRequest, base::Unretained(this)));

100	100

101 ASSERT_TRUE(RunExtensionTest("log_private/dump_logs"));	101 ASSERT_TRUE(RunExtensionTest("log_private/dump_logs"));

102 }	102 }

103	103

104 } // namespace extensions	104 } // namespace extensions

OLD	NEW