Order the script badges in the location bar consistently

chrome/browser/extensions/page_action_controller.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/extensions/page_action_controller.h"
 
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 
 namespace extensions {
 
 PageActionController::PageActionController(TabContents* tab_contents)
     : tab_contents_(tab_contents) {}
 
 PageActionController::~PageActionController() {}
 
-scoped_ptr<std::vector<ExtensionAction*> >
-PageActionController::GetCurrentActions() {
-  scoped_ptr<std::vector<ExtensionAction*> > current_actions(
-      new std::vector<ExtensionAction*>());
-
+std::vector<ExtensionAction*> PageActionController::GetCurrentActions() {
   ExtensionService* service = GetExtensionService();
   if (!service)
-    return current_actions.Pass();
+    return std::vector<ExtensionAction*>();
+
+  std::vector<ExtensionAction*> current_actions;
 
   for (ExtensionSet::const_iterator i = service->extensions()->begin();
        i != service->extensions()->end(); ++i) {
     ExtensionAction* action = (*i)->page_action();
     if (action)
-      current_actions->push_back(action);
+      current_actions.push_back(action);
   }
-  return current_actions.Pass();
+  return current_actions;
 }
 
 LocationBarController::Action PageActionController::OnClicked(
     const std::string& extension_id, int mouse_button) {
   ExtensionService* service = GetExtensionService();
   if (!service)
     return ACTION_NONE;
 
   const Extension* extension = service->extensions()->GetByID(extension_id);
   CHECK(extension);
@@ skipping 22 matching lines @@
   }
 
   return ACTION_NONE;
 }
 
 ExtensionService* PageActionController::GetExtensionService() {
   return ExtensionSystem::Get(tab_contents_->profile())->extension_service();
 }
 
 }  // namespace extensions