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

Side by Side Diff: chrome/browser/safe_browsing/download_protection_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, 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 "chrome/browser/safe_browsing/download_protection_service.h" 5 #include "chrome/browser/safe_browsing/download_protection_service.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/base_paths.h" 10 #include "base/base_paths.h"
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/file_util.h"
14 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
14 #include "base/files/file_util.h"
15 #include "base/files/scoped_temp_dir.h" 15 #include "base/files/scoped_temp_dir.h"
16 #include "base/memory/ref_counted.h" 16 #include "base/memory/ref_counted.h"
17 #include "base/memory/scoped_ptr.h" 17 #include "base/memory/scoped_ptr.h"
18 #include "base/message_loop/message_loop.h" 18 #include "base/message_loop/message_loop.h"
19 #include "base/path_service.h" 19 #include "base/path_service.h"
20 #include "base/run_loop.h" 20 #include "base/run_loop.h"
21 #include "base/strings/string_number_conversions.h" 21 #include "base/strings/string_number_conversions.h"
22 #include "base/threading/sequenced_worker_pool.h" 22 #include "base/threading/sequenced_worker_pool.h"
23 #include "chrome/browser/history/history_service.h" 23 #include "chrome/browser/history/history_service.h"
24 #include "chrome/browser/history/history_service_factory.h" 24 #include "chrome/browser/history/history_service_factory.h"
(...skipping 1454 matching lines...) Expand 10 before | Expand all | Expand 10 after
1479 EXPECT_THAT(whitelist_strings, ElementsAre(cert_base + "/OU=unit")); 1479 EXPECT_THAT(whitelist_strings, ElementsAre(cert_base + "/OU=unit"));
1480 1480
1481 cert = ReadTestCertificate("test_c.pem"); 1481 cert = ReadTestCertificate("test_c.pem");
1482 ASSERT_TRUE(cert.get()); 1482 ASSERT_TRUE(cert.get());
1483 whitelist_strings.clear(); 1483 whitelist_strings.clear();
1484 GetCertificateWhitelistStrings( 1484 GetCertificateWhitelistStrings(
1485 *cert.get(), *issuer_cert.get(), &whitelist_strings); 1485 *cert.get(), *issuer_cert.get(), &whitelist_strings);
1486 EXPECT_THAT(whitelist_strings, ElementsAre()); 1486 EXPECT_THAT(whitelist_strings, ElementsAre());
1487 } 1487 }
1488 } // namespace safe_browsing 1488 } // namespace safe_browsing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698