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

Side by Side Diff: chrome/browser/captive_portal/captive_portal_browsertest.cc

Issue 12212048: Linux/ChromeOS Chromium style checker cleanup, chrome/browser edition. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 7 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 | 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 <map> 5 #include <map>
6 #include <set> 6 #include <set>
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 void WaitForResults(int num_results_to_wait_for); 684 void WaitForResults(int num_results_to_wait_for);
685 685
686 int num_results_received() const { return num_results_received_; } 686 int num_results_received() const { return num_results_received_; }
687 687
688 Result captive_portal_result() const { 688 Result captive_portal_result() const {
689 return captive_portal_result_; 689 return captive_portal_result_;
690 } 690 }
691 691
692 private: 692 private:
693 // Records results and exits the message loop, if needed. 693 // Records results and exits the message loop, if needed.
694 void Observe(int type, 694 virtual void Observe(int type,
695 const content::NotificationSource& source, 695 const content::NotificationSource& source,
696 const content::NotificationDetails& details); 696 const content::NotificationDetails& details) OVERRIDE;
697 697
698 // Number of times OnPortalResult has been called since construction. 698 // Number of times OnPortalResult has been called since construction.
699 int num_results_received_; 699 int num_results_received_;
700 700
701 // If WaitForResults was called, the total number of updates for which to 701 // If WaitForResults was called, the total number of updates for which to
702 // wait. Value doesn't matter when |waiting_for_result_| is false. 702 // wait. Value doesn't matter when |waiting_for_result_| is false.
703 int num_results_to_wait_for_; 703 int num_results_to_wait_for_;
704 704
705 bool waiting_for_result_; 705 bool waiting_for_result_;
706 706
(...skipping 1490 matching lines...) Expand 10 before | Expand all | Expand 10 after
2197 base::Bind(&AddHstsHost, 2197 base::Bind(&AddHstsHost,
2198 make_scoped_refptr(browser()->profile()->GetRequestContext()), 2198 make_scoped_refptr(browser()->profile()->GetRequestContext()),
2199 http_timeout_url.host())); 2199 http_timeout_url.host()));
2200 2200
2201 SlowLoadBehindCaptivePortal(browser(), true, http_timeout_url, 1, 1); 2201 SlowLoadBehindCaptivePortal(browser(), true, http_timeout_url, 1, 1);
2202 Login(browser(), 1, 0); 2202 Login(browser(), 1, 0);
2203 FailLoadsAfterLogin(browser(), 1); 2203 FailLoadsAfterLogin(browser(), 1);
2204 } 2204 }
2205 2205
2206 } // namespace captive_portal 2206 } // namespace captive_portal
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698