chrome/browser/extensions/api/downloads/downloads_api_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/extensions/api/downloads/downloads_api_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/extensions/api/downloads/downloads_api.cc ('k') | chrome/browser/extensions/api/file_handlers/app_file_handler_util.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 // Disable everything on windows only. http://crbug.com/306144	5 // Disable everything on windows only. http://crbug.com/306144

6 #ifndef OS_WIN	6 #ifndef OS_WIN

7	7

8 #include <algorithm>	8 #include <algorithm>

9	9

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/json/json_reader.h"	12 #include "base/json/json_reader.h"

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

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

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

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

17 #include "base/synchronization/waitable_event.h"	17 #include "base/synchronization/waitable_event.h"

18 #include "chrome/browser/download/download_file_icon_extractor.h"	18 #include "chrome/browser/download/download_file_icon_extractor.h"

19 #include "chrome/browser/download/download_service.h"	19 #include "chrome/browser/download/download_service.h"

20 #include "chrome/browser/download/download_service_factory.h"	20 #include "chrome/browser/download/download_service_factory.h"

(...skipping 4134 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
4155 EXPECT_EQ(downloads::FILENAME_CONFLICT_ACTION_PROMPT, conflict_action);	4155 EXPECT_EQ(downloads::FILENAME_CONFLICT_ACTION_PROMPT, conflict_action);

4156 EXPECT_FALSE(warnings.empty());	4156 EXPECT_FALSE(warnings.empty());

4157 EXPECT_EQ(ExtensionWarning::kDownloadFilenameConflict,	4157 EXPECT_EQ(ExtensionWarning::kDownloadFilenameConflict,

4158 warnings.begin()->warning_type());	4158 warnings.begin()->warning_type());

4159 EXPECT_EQ("incumbent", warnings.begin()->extension_id());	4159 EXPECT_EQ("incumbent", warnings.begin()->extension_id());

4160 }	4160 }

4161	4161

4162 } // namespace extensions	4162 } // namespace extensions

4163	4163

4164 #endif // http://crbug.com/3061144	4164 #endif // http://crbug.com/3061144

OLD	NEW