Add logging for distinguishing between captive portals with HTTP and HTTPS login pages

chrome/browser/captive_portal/captive_portal_detector.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_DETECTOR_H_
 #define CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_DETECTOR_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 20 matching lines @@
   RESULT_BEHIND_CAPTIVE_PORTAL,
   RESULT_COUNT
 };
 
 class CaptivePortalDetector : public net::URLFetcherDelegate,
                               public base::NonThreadSafe {
  public:
   struct Results {
     Results()
         : result(RESULT_NO_RESPONSE),
-          response_code(net::URLFetcher::RESPONSE_CODE_INVALID) {
+          response_code(net::URLFetcher::RESPONSE_CODE_INVALID),
+          is_response_https(false) {
     }
 
     Result result;
     int response_code;
     base::TimeDelta retry_after_delta;
+    bool is_response_https;

[mmenke, 2014/03/26 14:46:08]

This should be was_redirected_to_https, since the initial response is always
HTTP.

However, I think it would make more sense to just record the final URL, and let
the consumer decide what to do with it - this is more flexible for future logic
(Could, for instance, open the new tab at this URL, rather than following the
redirects)

[meacer, 2014/03/26 17:04:57]

Done.

   };
 
   typedef base::Callback<void(const Results& results)> DetectionCallback;
 
   // The test URL.  When connected to the Internet, it should return a
   // blank page with a 204 status code.  When behind a captive portal,
   // requests for this URL should get an HTTP redirect or a login
   // page.  When neither is true, no server should respond to requests
   // for this URL.
   static const char kDefaultURL[];
@@ skipping 51 matching lines @@
 
   // Test time used by unit tests.
   base::Time time_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(CaptivePortalDetector);
 };
 
 }  // namespace captive_portal
 
 #endif  // CHROME_BROWSER_CAPTIVE_PORTAL_CAPTIVE_PORTAL_DETECTOR_H_