Remove NetworkChangeNotifierCast.

chromecast/net/connectivity_checker.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromecast/net/connectivity_checker.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "chromecast/net/net_switches.h"
@@ skipping 51 matching lines @@
   net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
   if (!net::NetworkChangeNotifier::IsOffline()) {
     loop_proxy_->PostTask(FROM_HERE,
                           base::Bind(&ConnectivityChecker::Check, this));
   }
 }
 
 ConnectivityChecker::~ConnectivityChecker() {
   DCHECK(loop_proxy_.get());
   loop_proxy_->DeleteSoon(FROM_HERE, url_request_context_.release());
+  loop_proxy_->DeleteSoon(FROM_HERE, url_request_.release());
 }
 
 void ConnectivityChecker::AddConnectivityObserver(
     ConnectivityObserver* observer) {
   connectivity_observer_list_->AddObserver(observer);
 }
 
 void ConnectivityChecker::RemoveConnectivityObserver(
     ConnectivityObserver* observer) {
   connectivity_observer_list_->RemoveObserver(observer);
@@ skipping 19 matching lines @@
                           base::Bind(&ConnectivityChecker::Check, this));
     return;
   }
   DCHECK(url_request_context_.get());
 
   // If url_request_ is non-null, there is already a check going on. Don't
   // start another.
   if (url_request_.get())
     return;
 
-  VLOG(2) << "Connectivity check: url=" << *connectivity_check_url_;
+  VLOG(1) << "Connectivity check: url=" << *connectivity_check_url_;
   url_request_ = url_request_context_->CreateRequest(
       *connectivity_check_url_, net::MAXIMUM_PRIORITY, this, NULL);
   url_request_->set_method("HEAD");
   url_request_->Start();
 }
 
 void ConnectivityChecker::OnConnectionTypeChanged(
     net::NetworkChangeNotifier::ConnectionType type) {
   Cancel();
 
@@ skipping 10 matching lines @@
   int http_response_code =
       (request->status().is_success() &&
        request->response_info().headers.get() != NULL)
           ? request->response_info().headers->response_code()
           : net::HTTP_BAD_REQUEST;
 
   // Clears resources.
   url_request_.reset(NULL);  // URLRequest::Cancel() is called in destructor.
 
   if (http_response_code < 400) {
+    VLOG(1) << "Connectivity check succeeded";
     bad_responses_ = 0;
     SetConnectivity(true);
     return;
   }
 
+  VLOG(1) << "Connectivity check failed: " << http_response_code;
   ++bad_responses_;
   if (bad_responses_ > kNumBadResponses) {
     bad_responses_ = kNumBadResponses;
     SetConnectivity(false);
   }
 
   // Check again
   if (!net::NetworkChangeNotifier::IsOffline()) {
     loop_proxy_->PostDelayedTask(
         FROM_HERE, base::Bind(&ConnectivityChecker::Check, this),
         base::TimeDelta::FromSeconds(kConnectivityPeriodSeconds));
   }
 }
 
 void ConnectivityChecker::OnReadCompleted(net::URLRequest* request,
                                           int bytes_read) {
   NOTREACHED();
 }
 
 void ConnectivityChecker::Cancel() {
   if (url_request_.get()) {
     VLOG(2) << "Cancel connectivity check in progress";
     url_request_.reset(NULL);  // URLRequest::Cancel() is called in destructor.
   }
 }
 
 }  // namespace chromecast