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

Side by Side Diff: chrome/browser/safe_browsing/safe_browsing_database.cc

Issue 1162973005: Stop including ip_address_number.h from net_util.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove some header sorting changes, seems to be breaking windows Created 5 years, 6 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
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/safe_browsing_database.h" 5 #include "chrome/browser/safe_browsing/safe_browsing_database.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/files/file_util.h" 11 #include "base/files/file_util.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "base/metrics/histogram.h" 14 #include "base/metrics/histogram.h"
15 #include "base/process/process_handle.h" 15 #include "base/process/process_handle.h"
16 #include "base/process/process_metrics.h" 16 #include "base/process/process_metrics.h"
17 #include "base/sha1.h" 17 #include "base/sha1.h"
18 #include "base/strings/string_number_conversions.h" 18 #include "base/strings/string_number_conversions.h"
19 #include "base/strings/string_util.h" 19 #include "base/strings/string_util.h"
20 #include "base/strings/stringprintf.h" 20 #include "base/strings/stringprintf.h"
21 #include "base/time/time.h" 21 #include "base/time/time.h"
22 #include "chrome/browser/safe_browsing/prefix_set.h" 22 #include "chrome/browser/safe_browsing/prefix_set.h"
23 #include "chrome/browser/safe_browsing/safe_browsing_store_file.h" 23 #include "chrome/browser/safe_browsing/safe_browsing_store_file.h"
24 #include "content/public/browser/browser_thread.h" 24 #include "content/public/browser/browser_thread.h"
25 #include "crypto/sha2.h" 25 #include "crypto/sha2.h"
26 #include "net/base/net_util.h" 26 #include "net/base/ip_address_number.h"
27 #include "url/gurl.h" 27 #include "url/gurl.h"
28 28
29 #if defined(OS_MACOSX) 29 #if defined(OS_MACOSX)
30 #include "base/mac/mac_util.h" 30 #include "base/mac/mac_util.h"
31 #endif 31 #endif
32 32
33 using content::BrowserThread; 33 using content::BrowserThread;
34 using safe_browsing::PrefixSet; 34 using safe_browsing::PrefixSet;
35 using safe_browsing::PrefixSetBuilder; 35 using safe_browsing::PrefixSetBuilder;
36 36
(...skipping 1787 matching lines...) Expand 10 before | Expand all | Expand 10 after
1824 else 1824 else
1825 NOTREACHED(); // Add support for new lists above. 1825 NOTREACHED(); // Add support for new lists above.
1826 1826
1827 // Histogram properties as in UMA_HISTOGRAM_COUNTS macro. 1827 // Histogram properties as in UMA_HISTOGRAM_COUNTS macro.
1828 base::HistogramBase* histogram_pointer = base::Histogram::FactoryGet( 1828 base::HistogramBase* histogram_pointer = base::Histogram::FactoryGet(
1829 histogram_name, 1, 1000000, 50, 1829 histogram_name, 1, 1000000, 50,
1830 base::HistogramBase::kUmaTargetedHistogramFlag); 1830 base::HistogramBase::kUmaTargetedHistogramFlag);
1831 1831
1832 histogram_pointer->Add(file_size_kilobytes); 1832 histogram_pointer->Add(file_size_kilobytes);
1833 } 1833 }
OLDNEW
« no previous file with comments | « chrome/browser/media/webrtc_logging_handler_host.cc ('k') | chrome/browser/safe_browsing/safe_browsing_database_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698