Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Side by Side Diff: chrome/browser/download/download_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
OLDNEW
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 <sstream> 5 #include <sstream>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h"
11 #include "base/files/file.h" 10 #include "base/files/file.h"
12 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/files/file_util.h"
13 #include "base/files/scoped_temp_dir.h" 13 #include "base/files/scoped_temp_dir.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/path_service.h" 15 #include "base/path_service.h"
16 #include "base/prefs/pref_service.h" 16 #include "base/prefs/pref_service.h"
17 #include "base/stl_util.h" 17 #include "base/stl_util.h"
18 #include "base/strings/string_number_conversions.h" 18 #include "base/strings/string_number_conversions.h"
19 #include "base/strings/string_split.h" 19 #include "base/strings/string_split.h"
20 #include "base/strings/string_util.h" 20 #include "base/strings/string_util.h"
21 #include "base/strings/stringprintf.h" 21 #include "base/strings/stringprintf.h"
22 #include "base/strings/utf_string_conversions.h" 22 #include "base/strings/utf_string_conversions.h"
(...skipping 3368 matching lines...) Expand 10 before | Expand all | Expand 10 after
3391 *(downloads[0]))); 3391 *(downloads[0])));
3392 3392
3393 // Begin feedback and check that the file is "stolen". 3393 // Begin feedback and check that the file is "stolen".
3394 download_protection_service->feedback_service()->BeginFeedbackForDownload( 3394 download_protection_service->feedback_service()->BeginFeedbackForDownload(
3395 downloads[0]); 3395 downloads[0]);
3396 std::vector<DownloadItem*> updated_downloads; 3396 std::vector<DownloadItem*> updated_downloads;
3397 GetDownloads(browser(), &updated_downloads); 3397 GetDownloads(browser(), &updated_downloads);
3398 ASSERT_TRUE(updated_downloads.empty()); 3398 ASSERT_TRUE(updated_downloads.empty());
3399 } 3399 }
3400 #endif 3400 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698