Order the script badges in the location bar consistently

chrome/browser/extensions/page_action_controller.cc

Index: chrome/browser/extensions/page_action_controller.cc
diff --git a/chrome/browser/extensions/page_action_controller.cc b/chrome/browser/extensions/page_action_controller.cc
index 9ba6f5428a0984a372fcf25ab88c620a4efa7b02..59157a893c120a0dc74f12717317a0ddd87878f5 100644
--- a/chrome/browser/extensions/page_action_controller.cc
+++ b/chrome/browser/extensions/page_action_controller.cc
@@ -21,22 +21,20 @@ PageActionController::PageActionController(TabContents* 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(