Reduce runtime of client_cert_resolver_unittest

chromeos/network/network_profile_handler.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 "chromeos/network/network_profile_handler.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
@@ skipping 93 matching lines @@
   std::vector<std::string> removed_profile_paths;
   for (ProfileList::const_iterator it = profiles_.begin();
        it != profiles_.end(); ++it) {
     if (std::find(new_profile_paths.begin(),
                   new_profile_paths.end(),
                   it->path) == new_profile_paths.end()) {
       removed_profile_paths.push_back(it->path);
     }
   }
 
-  for (std::vector<std::string>::const_iterator it =
-           removed_profile_paths.begin();
-       it != removed_profile_paths.end(); ++it) {
-    RemoveProfile(*it);
+  for (const std::string profile_path : removed_profile_paths) {

[Joao da Silva, 2014/10/24 12:01:06]

const&

(you can also use const auto&)

[pneubeck (no reviews), 2014/10/24 12:33:52]

Done.

+    RemoveProfile(profile_path);
+    // Also stop pending creations of this profile.
+    pending_profile_creations_.erase(profile_path);
   }
 
   for (std::vector<std::string>::const_iterator it = new_profile_paths.begin();
        it != new_profile_paths.end(); ++it) {
     // Skip known profiles. The associated userhash should never change.
-    if (GetProfileForPath(*it))
+    if (GetProfileForPath(*it) || pending_profile_creations_.count(*it) > 0)
       continue;
+    pending_profile_creations_.insert(*it);
 
     VLOG(2) << "Requesting properties of profile path " << *it << ".";
     DBusThreadManager::Get()->GetShillProfileClient()->GetProperties(
         dbus::ObjectPath(*it),
         base::Bind(&NetworkProfileHandler::GetProfilePropertiesCallback,
                    weak_ptr_factory_.GetWeakPtr(),
                    *it),
         base::Bind(&LogProfileRequestError, *it));
   }
 }
 
 void NetworkProfileHandler::GetProfilePropertiesCallback(
     const std::string& profile_path,
     const base::DictionaryValue& properties) {
+  if (pending_profile_creations_.erase(profile_path) == 0) {
+    VLOG(1) << "Ignore received properties, profile was removed.";
+    return;
+  }
+  if (GetProfileForPath(profile_path)) {
+    VLOG(1) << "Ignore received properties, profile is already created.";
+    return;
+  }
   std::string userhash;
   properties.GetStringWithoutPathExpansion(shill::kUserHashProperty, &userhash);
 
   AddProfile(NetworkProfile(profile_path, userhash));
 }
 
 void NetworkProfileHandler::AddProfile(const NetworkProfile& profile) {
   VLOG(2) << "Adding profile " << profile.ToDebugString() << ".";
   profiles_.push_back(profile);
   FOR_EACH_OBSERVER(NetworkProfileObserver, observers_,
@@ skipping 57 matching lines @@
       base::Bind(&NetworkProfileHandler::GetManagerPropertiesCallback,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 NetworkProfileHandler::~NetworkProfileHandler() {
   DBusThreadManager::Get()->GetShillManagerClient()->
       RemovePropertyChangedObserver(this);
 }
 
 }  // namespace chromeos