chrome/browser/chromeos/login/auth_prewarmer.cc - Issue 23712002: Cleanup network type matching.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/auth_prewarmer.cc

Issue 23712002: Cleanup network type matching. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed unit test in Debug. Created 7 years, 3 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:

Index: chrome/browser/chromeos/login/auth_prewarmer.cc

diff --git a/chrome/browser/chromeos/login/auth_prewarmer.cc b/chrome/browser/chromeos/login/auth_prewarmer.cc

index 64eb2ac02a693eeb382e3ea6b5d7f5d94fca3a6e..3fe03a17bc8dc4b1ecd98332b08ea83d955699c0 100644

--- a/chrome/browser/chromeos/login/auth_prewarmer.cc

+++ b/chrome/browser/chromeos/login/auth_prewarmer.cc

@@ -11,6 +11,7 @@

#include "chromeos/network/network_handler.h"

#include "chromeos/network/network_state.h"

#include "chromeos/network/network_state_handler.h"

+#include "chromeos/network/shill_property_util.h"

#include "content/public/browser/browser_thread.h"

#include "google_apis/gaia/gaia_urls.h"

#include "url/gurl.h"

@@ -112,8 +113,7 @@ void AuthPrewarmer::DoPrewarm() {

bool AuthPrewarmer::IsNetworkConnected() const {

NetworkStateHandler* nsh = NetworkHandler::Get()->network_state_handler();

- return (nsh->ConnectedNetworkByType(NetworkStateHandler::kMatchTypeDefault) !=

- NULL);

+ return (nsh->ConnectedNetworkByType(NetworkTypePattern::Default()) != NULL);

}

net::URLRequestContextGetter* AuthPrewarmer::GetRequestContext() const {