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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/client_side_detection_service.h" 5 #include "chrome/browser/safe_browsing/client_side_detection_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
14 #include "base/metrics/sparse_histogram.h" 14 #include "base/metrics/sparse_histogram.h"
15 #include "base/prefs/pref_service.h"
16 #include "base/single_thread_task_runner.h" 15 #include "base/single_thread_task_runner.h"
17 #include "base/stl_util.h" 16 #include "base/stl_util.h"
18 #include "base/thread_task_runner_handle.h" 17 #include "base/thread_task_runner_handle.h"
19 #include "base/time/time.h" 18 #include "base/time/time.h"
20 #include "chrome/browser/browser_process.h" 19 #include "chrome/browser/browser_process.h"
21 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
23 #include "chrome/common/safe_browsing/client_model.pb.h" 22 #include "chrome/common/safe_browsing/client_model.pb.h"
24 #include "chrome/common/safe_browsing/csd.pb.h" 23 #include "chrome/common/safe_browsing/csd.pb.h"
25 #include "chrome/common/safe_browsing/safebrowsing_messages.h" 24 #include "chrome/common/safe_browsing/safebrowsing_messages.h"
25 #include "components/prefs/pref_service.h"
26 #include "content/public/browser/browser_thread.h" 26 #include "content/public/browser/browser_thread.h"
27 #include "content/public/browser/notification_service.h" 27 #include "content/public/browser/notification_service.h"
28 #include "content/public/browser/notification_types.h" 28 #include "content/public/browser/notification_types.h"
29 #include "content/public/browser/render_process_host.h" 29 #include "content/public/browser/render_process_host.h"
30 #include "crypto/sha2.h" 30 #include "crypto/sha2.h"
31 #include "google_apis/google_api_keys.h" 31 #include "google_apis/google_api_keys.h"
32 #include "net/base/escape.h" 32 #include "net/base/escape.h"
33 #include "net/base/load_flags.h" 33 #include "net/base/load_flags.h"
34 #include "net/base/net_util.h" 34 #include "net/base/net_util.h"
35 #include "net/http/http_response_headers.h" 35 #include "net/http/http_response_headers.h"
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
520 const std::string& report_url) { 520 const std::string& report_url) {
521 GURL url(report_url); 521 GURL url(report_url);
522 std::string api_key = google_apis::GetAPIKey(); 522 std::string api_key = google_apis::GetAPIKey();
523 if (!api_key.empty()) 523 if (!api_key.empty())
524 url = url.Resolve("?key=" + net::EscapeQueryParamValue(api_key, true)); 524 url = url.Resolve("?key=" + net::EscapeQueryParamValue(api_key, true));
525 525
526 return url; 526 return url;
527 } 527 }
528 528
529 } // namespace safe_browsing 529 } // namespace safe_browsing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698