Refactor the setup of Shill*Stubs' default environment.

chrome/browser/chromeos/net/network_portal_detector_impl.cc

 // Copyright (c) 2013 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 "chrome/browser/chromeos/net/network_portal_detector_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chromeos/dbus/shill_service_client_stub.h"
+#include "chromeos/dbus/shill_stub_helper.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "net/http/http_status_code.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using captive_portal::CaptivePortalDetector;
 
@@ skipping 318 matching lines @@
     captive_portal_detector_->Cancel();
   detection_timeout_.Cancel();
   state_ = STATE_IDLE;
 }
 
 void NetworkPortalDetectorImpl::OnPortalDetectionCompleted(
     const CaptivePortalDetector::Results& results) {
   captive_portal::Result result = results.result;
   int response_code = results.response_code;
 
-  if (ShillServiceClientStub::IsStubPortalledWifiEnabled(
-          default_service_path_)) {
+  if (shill_stub_helper::IsStubPortalledWifiEnabled(default_service_path_)) {
     result = captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL;
     response_code = 200;
   }
 
   DCHECK(CalledOnValidThread());
   DCHECK(IsCheckingForPortal());
 
   VLOG(1) << "Portal detection completed: "
           << "network=" << default_network_id_ << ", "
           << "result=" << CaptivePortalDetector::CaptivePortalResultToString(
@@ skipping 125 matching lines @@
   const NetworkState* network =
       NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
   if (!network)
     return kBaseRequestTimeoutSec;
   if (lazy_detection_enabled_)
     return kLazyRequestTimeoutSec;
   return attempt_count_ * kBaseRequestTimeoutSec;
 }
 
 }  // namespace chromeos