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

Side by Side Diff: remoting/host/dns_blackhole_checker.cc

Issue 86523005: Replace all usage of LOG(INFO) in Chromoting host with HOST_LOG to bypass the presubmit check. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Renaming LOG_INFO to HOST_LOG Created 7 years 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 "remoting/host/dns_blackhole_checker.h" 5 #include "remoting/host/dns_blackhole_checker.h"
6 6
7 #include "net/url_request/url_fetcher.h" 7 #include "net/url_request/url_fetcher.h"
8 #include "net/url_request/url_request_context_getter.h" 8 #include "net/url_request/url_request_context_getter.h"
9 #include "remoting/base/logging.h"
9 #include "url/gurl.h" 10 #include "url/gurl.h"
10 11
11 namespace remoting { 12 namespace remoting {
12 13
13 // Default prefix added to the base talkgadget URL. 14 // Default prefix added to the base talkgadget URL.
14 const char kDefaultHostTalkGadgetPrefix[] = "chromoting-host"; 15 const char kDefaultHostTalkGadgetPrefix[] = "chromoting-host";
15 16
16 // The base talkgadget URL. 17 // The base talkgadget URL.
17 const char kTalkGadgetUrl[] = ".talkgadget.google.com/talkgadget/" 18 const char kTalkGadgetUrl[] = ".talkgadget.google.com/talkgadget/"
18 "oauth/chrome-remote-desktop-host"; 19 "oauth/chrome-remote-desktop-host";
19 20
20 DnsBlackholeChecker::DnsBlackholeChecker( 21 DnsBlackholeChecker::DnsBlackholeChecker(
21 scoped_refptr<net::URLRequestContextGetter> url_request_context_getter, 22 scoped_refptr<net::URLRequestContextGetter> url_request_context_getter,
22 std::string talkgadget_prefix) 23 std::string talkgadget_prefix)
23 : url_request_context_getter_(url_request_context_getter), 24 : url_request_context_getter_(url_request_context_getter),
24 talkgadget_prefix_(talkgadget_prefix) { 25 talkgadget_prefix_(talkgadget_prefix) {
25 } 26 }
26 27
27 DnsBlackholeChecker::~DnsBlackholeChecker() { 28 DnsBlackholeChecker::~DnsBlackholeChecker() {
28 } 29 }
29 30
30 // This is called in response to the TalkGadget http request initiated from 31 // This is called in response to the TalkGadget http request initiated from
31 // CheckStatus(). 32 // CheckStatus().
32 void DnsBlackholeChecker::OnURLFetchComplete(const net::URLFetcher* source) { 33 void DnsBlackholeChecker::OnURLFetchComplete(const net::URLFetcher* source) {
33 int response = source->GetResponseCode(); 34 int response = source->GetResponseCode();
34 bool allow = false; 35 bool allow = false;
35 if (source->GetResponseCode() == 200) { 36 if (source->GetResponseCode() == 200) {
36 LOG(INFO) << "Successfully connected to host talkgadget."; 37 HOST_LOG << "Successfully connected to host talkgadget.";
37 allow = true; 38 allow = true;
38 } else { 39 } else {
39 LOG(INFO) << "Unable to connect to host talkgadget (" << response << ")"; 40 HOST_LOG << "Unable to connect to host talkgadget (" << response << ")";
40 } 41 }
41 url_fetcher_.reset(NULL); 42 url_fetcher_.reset(NULL);
42 callback_.Run(allow); 43 callback_.Run(allow);
43 callback_.Reset(); 44 callback_.Reset();
44 } 45 }
45 46
46 void DnsBlackholeChecker::CheckForDnsBlackhole( 47 void DnsBlackholeChecker::CheckForDnsBlackhole(
47 const base::Callback<void(bool)>& callback) { 48 const base::Callback<void(bool)>& callback) {
48 // Make sure we're not currently in the middle of a connection check. 49 // Make sure we're not currently in the middle of a connection check.
49 if (!url_fetcher_.get()) { 50 if (!url_fetcher_.get()) {
50 DCHECK(callback_.is_null()); 51 DCHECK(callback_.is_null());
51 callback_ = callback; 52 callback_ = callback;
52 std::string talkgadget_url("https://"); 53 std::string talkgadget_url("https://");
53 if (talkgadget_prefix_.empty()) { 54 if (talkgadget_prefix_.empty()) {
54 talkgadget_url += kDefaultHostTalkGadgetPrefix; 55 talkgadget_url += kDefaultHostTalkGadgetPrefix;
55 } else { 56 } else {
56 talkgadget_url += talkgadget_prefix_; 57 talkgadget_url += talkgadget_prefix_;
57 } 58 }
58 talkgadget_url += kTalkGadgetUrl; 59 talkgadget_url += kTalkGadgetUrl;
59 LOG(INFO) << "Verifying connection to " << talkgadget_url; 60 HOST_LOG << "Verifying connection to " << talkgadget_url;
60 url_fetcher_.reset(net::URLFetcher::Create(GURL(talkgadget_url), 61 url_fetcher_.reset(net::URLFetcher::Create(GURL(talkgadget_url),
61 net::URLFetcher::GET, this)); 62 net::URLFetcher::GET, this));
62 url_fetcher_->SetRequestContext(url_request_context_getter_.get()); 63 url_fetcher_->SetRequestContext(url_request_context_getter_.get());
63 url_fetcher_->Start(); 64 url_fetcher_->Start();
64 } else { 65 } else {
65 LOG(INFO) << "Pending connection check"; 66 HOST_LOG << "Pending connection check";
66 } 67 }
67 } 68 }
68 69
69 } // namespace remoting 70 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698