Clean up shill fake implementations

chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

 // Copyright 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 "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/users/user.h"
@@ skipping 216 matching lines @@
         base::StringValue(shill::kRoamingStateHome));
     DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
         SortManagerServices();
     content::RunAllPendingInMessageLoop();
   }
 
   void AddService(const std::string& service_path,
                   const std::string& name,
                   const std::string& type,
                   const std::string& state) {
-    const bool add_to_watchlist = true;
     const bool add_to_visible = true;
     // Tests need a known GUID, so use 'service_path'.
     service_test_->AddServiceWithIPConfig(
         service_path, service_path /* guid */, name,
         type, state, "" /* ipconfig_path */,
-        add_to_visible, add_to_watchlist);
+        add_to_visible);
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     detector_ = new NetworkPortalDetectorTestImpl();
     NetworkPortalDetector::InitializeForTesting(detector_);
 
     ExtensionApiTest::SetUpOnMainThread();
     content::RunAllPendingInMessageLoop();
 
     InitializeSanitizedUsername();
 
     DBusThreadManager* dbus_manager = DBusThreadManager::Get();
     manager_test_ = dbus_manager->GetShillManagerClient()->GetTestInterface();
     service_test_ = dbus_manager->GetShillServiceClient()->GetTestInterface();
     device_test_ = dbus_manager->GetShillDeviceClient()->GetTestInterface();
 
     ShillIPConfigClient::TestInterface* ip_config_test =
         dbus_manager->GetShillIPConfigClient()->GetTestInterface();
     ShillProfileClient::TestInterface* profile_test =
         dbus_manager->GetShillProfileClient()->GetTestInterface();
 
     device_test_->ClearDevices();
     service_test_->ClearServices();
+    profile_test->ClearProfiles();
 
     // Sends a notification about the added profile.
     profile_test->AddProfile(kUser1ProfilePath, userhash_);
 
     // Add IPConfigs
     base::DictionaryValue ipconfig;
     ipconfig.SetStringWithoutPathExpansion(shill::kAddressProperty, "0.0.0.0");
     ipconfig.SetStringWithoutPathExpansion(shill::kGatewayProperty, "0.0.0.1");
     ipconfig.SetIntegerWithoutPathExpansion(shill::kPrefixlenProperty, 0);
     ipconfig.SetStringWithoutPathExpansion(shill::kMethodProperty,
@@ skipping 340 matching lines @@
 
   TestListener listener(
       "notifyPortalDetectorObservers",
       base::Bind(&NetworkPortalDetectorTestImpl::NotifyObserversForTesting,
                  base::Unretained(detector())));
   EXPECT_TRUE(RunNetworkingSubtest("captivePortalNotification")) << message_;
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace