Unload old Cast extensions after initializing ToolbarActionsModel

chrome/browser/ui/toolbar/toolbar_actions_model.cc

 // Copyright (c) 2012 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/ui/toolbar/toolbar_actions_model.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/location.h"
@@ skipping 250 matching lines @@
   InitializeActionList();
   // Wait until the extension system is ready before observing any further
   // changes so that the toolbar buttons can be shown in their stable ordering
   // taken from prefs.
   extension_registry_observer_.Add(extension_registry_);
   extension_action_observer_.Add(extension_action_api_);
 
   actions_initialized_ = true;
   for (Observer& observer : observers_)
     observer.OnToolbarModelInitialized();
+
+  if (use_redesign_) {

[mark a. foltz, 2017/02/14 23:16:09]

Is it still possible to turn the extension action redesign off?  I suppose so if
this flag is still present.

[Devlin, 2017/02/14 23:18:49]

I'm slowly working on removing them all; I'll get to this one soon. :)

+    ComponentToolbarActionsFactory::GetInstance()->UnloadMigratedExtensions(
+        extensions::ExtensionSystem::Get(profile_)->extension_service(),
+        extension_registry_);
+  }
 }
 
 size_t ToolbarActionsModel::FindNewPositionFromLastKnownGood(
     const ToolbarItem& action) {
   // See if we have last known good position for this action.
   size_t new_index = 0;
   // Loop through the ID list of known positions, to count the number of
   // visible action icons preceding |action|'s id.
   for (const std::string& last_pos_id : last_known_positions_) {
     if (last_pos_id == action.id)
@@ skipping 565 matching lines @@
   return extension_registry_->enabled_extensions().GetByID(id);
 }
 
 bool ToolbarActionsModel::IsActionVisible(const std::string& action_id) const {
   size_t index = 0u;
   while (toolbar_items().size() > index &&
          toolbar_items()[index].id != action_id)
     ++index;
   return index < visible_icon_count();
 }