Order the script badges in the location bar consistently

chrome/browser/extensions/location_bar_controller.h

Index: chrome/browser/extensions/location_bar_controller.h
diff --git a/chrome/browser/extensions/location_bar_controller.h b/chrome/browser/extensions/location_bar_controller.h
index 7f468b17f188c2b95ac3c7b518fb56e894a73479..68048b0b0f42bbb5a8243808119f37a0a7b70ab7 100644
--- a/chrome/browser/extensions/location_bar_controller.h
+++ b/chrome/browser/extensions/location_bar_controller.h
@@ -10,8 +10,6 @@
 #include <string>
 #include <vector>
 
-#include "base/memory/scoped_ptr.h"
-
 class ExtensionAction;
 
 namespace extensions {
@@ -36,7 +34,7 @@ class LocationBarController {
       std::vector<ExtensionAction*>* out);
 
   // Gets the action data for all extensions.
-  virtual scoped_ptr<std::vector<ExtensionAction*> > GetCurrentActions() = 0;
+  virtual std::vector<ExtensionAction*> GetCurrentActions() = 0;
 
   // Notifies this that the badge for an extension has been clicked with some
   // mouse button (1 for left, 2 for middle, and 3 for right click), and