chrome/browser/extensions/api/webstore_private/webstore_private_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/api/webstore_private/webstore_private_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

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 <vector>	5 #include <vector>

6	6

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

8 #include "base/file_util.h"

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

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

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

11 #include "base/strings/stringprintf.h"	11 #include "base/strings/stringprintf.h"

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

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

14 #include "chrome/browser/extensions/api/identity/identity_api.h"	14 #include "chrome/browser/extensions/api/identity/identity_api.h"

15 #include "chrome/browser/extensions/api/management/management_api.h"	15 #include "chrome/browser/extensions/api/management/management_api.h"

16 #include "chrome/browser/extensions/api/webstore_private/webstore_private_api.h"	16 #include "chrome/browser/extensions/api/webstore_private/webstore_private_api.h"

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

18 #include "chrome/browser/extensions/extension_function_test_utils.h"	18 #include "chrome/browser/extensions/extension_function_test_utils.h"

19 #include "chrome/browser/extensions/extension_install_prompt.h"	19 #include "chrome/browser/extensions/extension_install_prompt.h"

(...skipping 594 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
614 }	614 }

615	615

616 // Run tests when the --enable-ephemeral-apps switch is enabled.	616 // Run tests when the --enable-ephemeral-apps switch is enabled.

617 IN_PROC_BROWSER_TEST_F(EphemeralAppWebstorePrivateApiTest, LaunchEphemeralApp) {	617 IN_PROC_BROWSER_TEST_F(EphemeralAppWebstorePrivateApiTest, LaunchEphemeralApp) {

618 CommandLine::ForCurrentProcess()->AppendSwitch(	618 CommandLine::ForCurrentProcess()->AppendSwitch(

619 switches::kEnableEphemeralApps);	619 switches::kEnableEphemeralApps);

620 ASSERT_TRUE(RunInstallTest("webstore_launch_app.html", "app.crx"));	620 ASSERT_TRUE(RunInstallTest("webstore_launch_app.html", "app.crx"));

621 }	621 }

622	622

623 } // namespace extensions	623 } // namespace extensions

OLD	NEW