chrome/browser/apps/app_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/apps/app_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/android/thumbnail/thumbnail_store.cc ('k') | chrome/browser/autofill/autofill_browsertest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 "apps/app_window.h"	5 #include "apps/app_window.h"

6 #include "apps/app_window_registry.h"	6 #include "apps/app_window_registry.h"

7 #include "apps/launcher.h"	7 #include "apps/launcher.h"

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

9 #include "base/command_line.h"	9 #include "base/command_line.h"

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

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

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

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

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

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

16 #include "chrome/browser/apps/app_browsertest_util.h"	16 #include "chrome/browser/apps/app_browsertest_util.h"

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

18 #include "chrome/browser/devtools/devtools_window.h"	18 #include "chrome/browser/devtools/devtools_window.h"

19 #include "chrome/browser/extensions/api/permissions/permissions_api.h"	19 #include "chrome/browser/extensions/api/permissions/permissions_api.h"

20 #include "chrome/browser/extensions/component_loader.h"	20 #include "chrome/browser/extensions/component_loader.h"

(...skipping 1300 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1321 LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched");	1321 LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched");

1322 ASSERT_TRUE(extension);	1322 ASSERT_TRUE(extension);

1323 ASSERT_EQ(extension_id, extension->id());	1323 ASSERT_EQ(extension_id, extension->id());

1324	1324

1325 ExtensionApiTest::ResultCatcher result_catcher;	1325 ExtensionApiTest::ResultCatcher result_catcher;

1326 EXPECT_TRUE(result_catcher.GetNextResult());	1326 EXPECT_TRUE(result_catcher.GetNextResult());

1327 }	1327 }

1328 }	1328 }

1329	1329

1330 } // namespace extensions	1330 } // namespace extensions

OLD	NEW