Update device name in chooser when device changes name (desktops)

chrome/browser/chooser_controller/mock_chooser_controller.cc

 // Copyright 2016 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/chooser_controller/mock_chooser_controller.h"
 
+#include <algorithm>
+
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 MockChooserController::MockChooserController(content::RenderFrameHost* owner)
     : ChooserController(owner,
                         IDS_USB_DEVICE_CHOOSER_PROMPT_ORIGIN,
                         IDS_USB_DEVICE_CHOOSER_PROMPT_EXTENSION_NAME),
       no_options_text_(l10n_util::GetStringUTF16(
@@ skipping 63 matching lines @@
       status_text_ =
           l10n_util::GetStringUTF16(IDS_BLUETOOTH_DEVICE_CHOOSER_RE_SCAN);
       if (view()) {
         view()->OnRefreshStateChanged(
             false /* Refreshing options is complete */);
       }
       break;
   }
 }
 
-void MockChooserController::OptionAdded(const base::string16 option_name) {
+void MockChooserController::OptionAdded(const base::string16& option_name) {
   option_names_.push_back(option_name);
   if (view())
     view()->OnOptionAdded(option_names_.size() - 1);
 }
 
-void MockChooserController::OptionRemoved(const base::string16 option_name) {
-  for (auto it = option_names_.begin(); it != option_names_.end(); ++it) {
-    if (*it == option_name) {
-      size_t index = it - option_names_.begin();
-      option_names_.erase(it);
-      if (view())
-        view()->OnOptionRemoved(index);
-      return;
-    }
+void MockChooserController::OptionRemoved(const base::string16& option_name) {
+  auto it = std::find(option_names_.begin(), option_names_.end(), option_name);
+  if (it != option_names_.end()) {
+    size_t index = std::distance(option_names_.begin(), it);
+    option_names_.erase(it);
+    if (view())
+      view()->OnOptionRemoved(index);
   }
 }
 
+void MockChooserController::OptionUpdated(
+    const base::string16& previous_option_name,
+    const base::string16& new_option_name) {
+  auto it = std::find(option_names_.begin(), option_names_.end(),
+                      previous_option_name);
+  DCHECK(it != option_names_.end());
+  size_t index = std::distance(option_names_.begin(), it);
+  *it = new_option_name;
+  if (view())
+    view()->OnOptionUpdated(index);
+}
+
 void MockChooserController::ClearAllOptions() {
   option_names_.clear();
 }