Clean up shill fake implementations

chrome/browser/chromeos/customization_document_unittest.cc

 // Copyright (c) 2011 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/customization_document.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
 #include "chrome/browser/extensions/external_provider_impl.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service_mock_factory.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/network_handler.h"
+#include "chromeos/network/network_state.h"
+#include "chromeos/network/network_state_handler.h"
 #include "chromeos/system/mock_statistics_provider.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 56 matching lines @@
     "      \"default_apps_folder_name\": \"EN OEM Name\"\n"
     "    },\n"
     "    \"default\": {\n"
     "      \"default_apps_folder_name\": \"Default OEM Name\"\n"
     "    }\n"
     "  }\n"
     "}";
 
 const char kDummyCustomizationID[] = "test-dummy";
 
-// Note the path name must be the same as in shill stub.
-const char kStubEthernetServicePath[] = "eth1";
-
 }  // anonymous namespace
 
 namespace chromeos {
 
 using ::testing::_;
 using ::testing::DoAll;
 using ::testing::NotNull;
 using ::testing::Return;
 using ::testing::SetArgumentPointee;
 
@@ skipping 111 matching lines @@
   virtual void SetUp() OVERRIDE {
     ServicesCustomizationDocument::InitializeForTesting();
 
     EXPECT_CALL(mock_statistics_provider_, GetMachineStatistic(_, NotNull()))
         .WillRepeatedly(Return(false));
     chromeos::system::StatisticsProvider::SetTestProvider(
         &mock_statistics_provider_);
 
     DBusThreadManager::InitializeWithStub();
     NetworkHandler::Initialize();
+    RunUntilIdle();
+    std::string default_network_path =
+        NetworkHandler::Get()->network_state_handler()->default_network_path();
 
     NetworkPortalDetector::InitializeForTesting(&network_portal_detector_);
     NetworkPortalDetector::CaptivePortalState online_state;
     online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
     online_state.response_code = 204;
     network_portal_detector_.SetDefaultNetworkPathForTesting(
-        kStubEthernetServicePath);
+        default_network_path);
     network_portal_detector_.SetDetectionResultsForTesting(
-        kStubEthernetServicePath, online_state);
+        default_network_path, online_state);
 
     TestingBrowserProcess::GetGlobal()->SetLocalState(&local_state_);
     ServicesCustomizationDocument::RegisterPrefs(local_state_.registry());
   }
 
   virtual void TearDown() OVERRIDE {
     TestingBrowserProcess::GetGlobal()->SetLocalState(NULL);
     NetworkHandler::Shutdown();
     DBusThreadManager::Shutdown();
     NetworkPortalDetector::InitializeForTesting(NULL);
@@ skipping 218 matching lines @@
   EXPECT_CALL(visitor, OnExternalExtensionUpdateUrlFound(_, _, _, _, _, _))
       .Times(0);
   EXPECT_CALL(visitor, OnExternalProviderReady(_))
       .Times(1);
 
   RunUntilIdle();
   EXPECT_TRUE(doc->IsReady());
 }
 
 }  // namespace chromeos