chrome/browser/safe_browsing/download_feedback_service_unittest.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/safe_browsing/download_feedback_service_unittest.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, 4 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/resources/pdf/pdf_extension_test.cc ('k') | chrome/browser/safe_browsing/download_feedback_unittest.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 "chrome/browser/safe_browsing/download_feedback_service.h"	5 #include "chrome/browser/safe_browsing/download_feedback_service.h"

6	6

7 #include <vector>	7 #include <vector>

8	8

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

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

11 #include "base/run_loop.h"	11 #include "base/run_loop.h"

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

13 #include "chrome/browser/safe_browsing/download_feedback.h"	13 #include "chrome/browser/safe_browsing/download_feedback.h"

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

15 #include "content/public/test/mock_download_item.h"	15 #include "content/public/test/mock_download_item.h"

16 #include "content/public/test/test_browser_thread_bundle.h"	16 #include "content/public/test/test_browser_thread_bundle.h"

17 #include "net/url_request/url_request_test_util.h"	17 #include "net/url_request/url_request_test_util.h"

18 #include "testing/gmock/include/gmock/gmock.h"	18 #include "testing/gmock/include/gmock/gmock.h"

19 #include "testing/gtest/include/gtest/gtest.h"	19 #include "testing/gtest/include/gtest/gtest.h"

(...skipping 346 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
366 // was deleted.	366 // was deleted.

367 EXPECT_FALSE(base::PathExists(file_path[2]));	367 EXPECT_FALSE(base::PathExists(file_path[2]));

368	368

369 // These files should still exist since the FakeDownloadFeedback does not	369 // These files should still exist since the FakeDownloadFeedback does not

370 // delete them.	370 // delete them.

371 EXPECT_TRUE(base::PathExists(file_path[0]));	371 EXPECT_TRUE(base::PathExists(file_path[0]));

372 EXPECT_TRUE(base::PathExists(file_path[1]));	372 EXPECT_TRUE(base::PathExists(file_path[1]));

373 }	373 }

374	374

375 } // namespace safe_browsing	375 } // namespace safe_browsing

OLD	NEW