Clean up shill fake implementations

chrome/browser/chromeos/login/test/oobe_base_test.cc

 // Copyright 2014 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/login/test/oobe_base_test.h"
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/users/fake_user_manager.h"
 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chromeos/chromeos_switches.h"
+#include "chromeos/dbus/fake_shill_manager_client.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/browser_test_utils.h"
 #include "google_apis/gaia/gaia_switches.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 
 namespace chromeos {
 
-namespace {
-
-// Note the path name must be the same as in shill stub.
-const char kStubEthernetServicePath[] = "eth1";
-
-}  // namespace
-
 OobeBaseTest::OobeBaseTest()
     : fake_gaia_(new FakeGaia()),
       network_portal_detector_(NULL),
       needs_background_networking_(false) {
   set_exit_when_last_browser_closes(false);
   set_chromeos_user_ = false;
 }
 
 OobeBaseTest::~OobeBaseTest() {
 }
@@ skipping 10 matching lines @@
   embedded_test_server()->StopThread();
 
   ExtensionApiTest::SetUp();
 }
 
 void OobeBaseTest::SetUpInProcessBrowserTestFixture() {
   host_resolver()->AddRule("*", "127.0.0.1");
   network_portal_detector_ = new NetworkPortalDetectorTestImpl();
   NetworkPortalDetector::InitializeForTesting(network_portal_detector_);
   network_portal_detector_->SetDefaultNetworkPathForTesting(
-      kStubEthernetServicePath);
+      FakeShillManagerClient::kFakeEthernetNetworkPath);
 
   ExtensionApiTest::SetUpInProcessBrowserTestFixture();
 }
 
 void OobeBaseTest::SetUpOnMainThread() {
   // Restart the thread as the sandbox host process has already been spawned.
   embedded_test_server()->RestartThreadAndListen();
 
   ExtensionApiTest::SetUpOnMainThread();
 }
@@ skipping 30 matching lines @@
   command_line->AppendSwitchASCII(::switches::kLsoUrl, gaia_url.spec());
   command_line->AppendSwitchASCII(::switches::kGoogleApisUrl,
                                   gaia_url.spec());
   fake_gaia_->Initialize();
 }
 
 void OobeBaseTest::SimulateNetworkOffline() {
   NetworkPortalDetector::CaptivePortalState offline_state;
   offline_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE;
   network_portal_detector_->SetDetectionResultsForTesting(
-      kStubEthernetServicePath, offline_state);
+      FakeShillManagerClient::kFakeEthernetNetworkPath, offline_state);
   network_portal_detector_->NotifyObserversForTesting();
 }
 
 base::Closure OobeBaseTest::SimulateNetworkOfflineClosure() {
   return base::Bind(&OobeBaseTest::SimulateNetworkOffline,
                     base::Unretained(this));
 }
 
 void OobeBaseTest::SimulateNetworkOnline() {
   NetworkPortalDetector::CaptivePortalState online_state;
   online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
   online_state.response_code = 204;
   network_portal_detector_->SetDetectionResultsForTesting(
-      kStubEthernetServicePath, online_state);
+      FakeShillManagerClient::kFakeEthernetNetworkPath, online_state);
   network_portal_detector_->NotifyObserversForTesting();
 }
 
 base::Closure OobeBaseTest::SimulateNetworkOnlineClosure() {
   return base::Bind(&OobeBaseTest::SimulateNetworkOnline,
                     base::Unretained(this));
 }
 
 void OobeBaseTest::SimulateNetworkPortal() {
   NetworkPortalDetector::CaptivePortalState portal_state;
   portal_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;
   network_portal_detector_->SetDetectionResultsForTesting(
-      kStubEthernetServicePath, portal_state);
+      FakeShillManagerClient::kFakeEthernetNetworkPath, portal_state);
   network_portal_detector_->NotifyObserversForTesting();
 }
 
 base::Closure OobeBaseTest::SimulateNetworkPortalClosure() {
   return base::Bind(&OobeBaseTest::SimulateNetworkPortal,
                     base::Unretained(this));
 }
 
 void OobeBaseTest::JsExpect(const std::string& expression) {
   bool result;
@@ skipping 18 matching lines @@
 
 WebUILoginDisplay* OobeBaseTest::GetLoginDisplay() {
   ExistingUserController* controller =
       ExistingUserController::current_controller();
   CHECK(controller);
   return static_cast<WebUILoginDisplay*>(
       controller->login_display());
 }
 
 }  // namespace chromeos