Bug 593357 - Stop/Go/Reload button breaks resizing the location and search bar after it was relocated and reattached back to the location bar. r+a=gavin

--HG--
extra : rebase_source : f439d3f7662367ff3a6c61baf4689f7c265d68f3

browser/base/content/browser.js

@@ -3489,9 +3489,10 @@ function BrowserToolboxCustomizeDone(aToolboxChanged) {
   PlacesToolbarHelper.customizeDone();
   BookmarksMenuButton.customizeDone();
 
-  UpdateUrlbarSearchSplitterState();
-
+  // The url bar splitter state is dependent on whether stop/reload
+  // and the location bar are combined, so we need this ordering
   CombinedStopReload.init();
+  UpdateUrlbarSearchSplitterState();
 
   // Update the urlbar
   if (gURLBar) {