mozilla-central: changeset 59580:438d6a2f3a9ccc09c6c02a2e872d6b72454f5600

author	Ms2ger <ms2ger@gmail.com>
	Tue, 21 Dec 2010 15:03:01 -0800
changeset 59580	438d6a2f3a9ccc09c6c02a2e872d6b72454f5600
parent 59579	0257a5a7419adac83e1b99b3220bbad563e528a7
child 59581	52b229f6a051f989ad6fced46c44ef1bbfe0b938
push id	17673
push user	dholbert@mozilla.com
push date	Tue, 21 Dec 2010 23:04:38 +0000
treeherder	mozilla-central@52b229f6a051 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
bugs	620375
milestone	2.0b9pre
first release with	nightly linux32 b0c6a324e72f / 4.0b9pre / 20101222030351 / files nightly linux64 b0c6a324e72f / 4.0b9pre / 20101222030351 / files nightly mac b0c6a324e72f / 4.0b9pre / 20101222030351 / files nightly win32 b0c6a324e72f / 4.0b9pre / 20101222030351 / files nightly win64 d37e24f10e8d / 4.0b9pre / 20101222060055 / files
last release without	nightly linux32 fb629ae54510 / 4.0b9pre / 20101221030401 / files nightly linux64 fb629ae54510 / 4.0b9pre / 20101221030401 / files nightly mac fb629ae54510 / 4.0b9pre / 20101221030401 / files nightly win32 fb629ae54510 / 4.0b9pre / 20101221030401 / files nightly win64 fb629ae54510 / 4.0b9pre / 20101221045029 / files

--- a/toolkit/components/places/src/History.cpp
+++ b/toolkit/components/places/src/History.cpp
@@ -838,23 +838,23 @@ private:
 } // anonymous namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 //// History
 
 History* History::gService = NULL;
 
 History::History()
-: mShuttingDown(false)
-, syncStatements(mDBConn)
+  : syncStatements(mDBConn)
+  , mShuttingDown(false)
 {
   NS_ASSERTION(!gService, "Ruh-roh!  This service has already been created!");
   gService = this;
 
-  nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
+  nsCOMPtr<nsIObserverService> os = services::GetObserverService();
   NS_WARN_IF_FALSE(os, "Observer service was not found!");
   if (os) {
     (void)os->AddObserver(this, TOPIC_PLACES_SHUTDOWN, PR_FALSE);
   }
 }
 
 History::~History()
 {