Fixed browser tests for UpdateScreen to support blocking AU.

BUG=170104
TEST=browser_tests:UpdateScreenTest.*
TBR=sky@chromium.org

Review URL: https://chromiumcodereview.appspot.com/13496016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193616 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 6 deletions

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index f30f26b..d3acb3a 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -641,7 +641,7 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
   // NetworkLibrary about changes in the NetworkManager and initiates
   // captive portal detection for active networks.
   NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance();
-  if (NetworkPortalDetector::IsEnabled() && detector) {
+  if (NetworkPortalDetector::IsEnabledInCommandLine() && detector) {
     detector->Init();
 #if defined(GOOGLE_CHROME_BUILD)
     bool is_official_build = true;
@@ -651,7 +651,7 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
     // Enable portal detector if EULA was previously accepted or if
     // this is an unofficial build.
     if (!is_official_build || WizardController::IsEulaAccepted())
-      detector->set_enabled(true);
+      detector->Enable(true);
   }
 
   display_configuration_observer_.reset(
@@ -724,10 +724,9 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
   if (NetworkChangeNotifierFactoryChromeos::GetInstance())
     NetworkChangeNotifierFactoryChromeos::GetInstance()->Shutdown();
 
-  if (NetworkPortalDetector::IsEnabled() &&
-      NetworkPortalDetector::GetInstance()) {
-    NetworkPortalDetector::GetInstance()->Shutdown();
-  }
+  NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance();
+  if (NetworkPortalDetector::IsEnabledInCommandLine() && detector)
+    detector->Shutdown();
 
   // Tell DeviceSettingsService to stop talking to session_manager.
   DeviceSettingsService::Get()->Shutdown();