bug 943023 - unify some of toolkit/components/ and clean up the unification of rdf/ a tad r=ehsan

rdf/base/src/nsContainerEnumerator.cpp

@@ -79,9 +79,7 @@ ContainerEnumeratorImpl::Init()
 {
     if (gRefCnt++ == 0) {
         nsresult rv;
-
-        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
-        nsCOMPtr<nsIRDFService> rdf = do_GetService(kRDFServiceCID);
+        nsCOMPtr<nsIRDFService> rdf = do_GetService(NS_RDFSERVICE_CID);
         NS_ASSERTION(rdf != nullptr, "unable to acquire resource manager");
         if (! rdf)
             return NS_ERROR_FAILURE;
@@ -90,8 +88,7 @@ ContainerEnumeratorImpl::Init()
         NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get resource");
         if (NS_FAILED(rv)) return rv;
 
-        NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
-        rv = CallGetService(kRDFContainerUtilsCID, &gRDFC);
+        rv = CallGetService(NS_RDFCONTAINERUTILS_CID, &gRDFC);
         if (NS_FAILED(rv)) return rv;
     }
 

rdf/base/src/nsRDFContainer.cpp

@@ -686,10 +686,9 @@ RDFContainerImpl::GetNextValue(nsIRDFResource** aResult)
         }
     }
 
-    static const char kRDFNameSpaceURI[] = RDF_NAMESPACE_URI;
-    char buf[sizeof(kRDFNameSpaceURI) + 16];
+    char buf[sizeof(RDF_NAMESPACE_URI) + 16];
     nsFixedCString nextValStr(buf, sizeof(buf), 0);
-    nextValStr = kRDFNameSpaceURI;
+    nextValStr = RDF_NAMESPACE_URI;
     nextValStr.Append("_");
     nextValStr.AppendInt(nextVal, 10);
 

rdf/base/src/nsRDFContainerUtils.cpp

@@ -323,8 +323,7 @@ RDFContainerUtilsImpl::RDFContainerUtilsImpl()
     if (gRefCnt++ == 0) {
         nsresult rv;
 
-        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
-        rv = CallGetService(kRDFServiceCID, &gRDFService);
+        rv = CallGetService(NS_RDFSERVICE_CID, &gRDFService);
 
         NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get RDF service");
         if (NS_SUCCEEDED(rv)) {

rdf/base/src/nsRDFContentSink.cpp

@@ -270,8 +270,7 @@ RDFContentSinkImpl::RDFContentSinkImpl()
       mDocumentURL(nullptr)
 {
     if (gRefCnt++ == 0) {
-        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
-        nsresult rv = CallGetService(kRDFServiceCID, &gRDFService);
+        nsresult rv = CallGetService(NS_RDFSERVICE_CID, &gRDFService);
 
         NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get RDF service");
         if (NS_SUCCEEDED(rv)) {
@@ -289,8 +288,8 @@ RDFContentSinkImpl::RDFContentSinkImpl()
                                           &kRDF_nextVal);
         }
 
-        NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
-        rv = CallGetService(kRDFContainerUtilsCID, &gRDFContainerUtils);
+
+        rv = CallGetService(NS_RDFCONTAINERUTILS_CID, &gRDFContainerUtils);
 
         NS_RegisterStaticAtoms(rdf_atoms);
     }
@@ -380,7 +379,7 @@ RDFContentSinkImpl::QueryInterface(REFNSIID iid, void** result)
     if (iid.Equals(kIRDFContentSinkIID) ||
         iid.Equals(kIXMLContentSinkIID) ||
         iid.Equals(kIContentSinkIID) ||
-        iid.Equals(kISupportsIID)) {
+        iid.Equals(NS_GET_IID(nsISupports))) {
         *result = static_cast<nsIXMLContentSink*>(this);
         AddRef();
         return NS_OK;

rdf/base/src/nsRDFXMLDataSource.cpp

@@ -414,8 +414,7 @@ RDFXMLDataSourceImpl::Init()
     if (NS_FAILED(rv)) return rv;
 
     if (gRefCnt++ == 0) {
-        NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
-        rv = CallGetService(kRDFServiceCID, &gRDFService);
+        rv = CallGetService(NS_RDFSERVICE_CID, &gRDFService);
 
         NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get RDF service");
         if (NS_FAILED(rv)) return rv;

toolkit/components/url-classifier/moz.build

@@ -17,20 +17,27 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'url-classifier'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'ChunkSet.cpp',
     'Classifier.cpp',
-    'HashStore.cpp',
     'LookupCache.cpp',
     'nsCheckSummedOutputStream.cpp',
     'nsUrlClassifierDBService.cpp',
-    'nsUrlClassifierPrefixSet.cpp',
     'nsUrlClassifierProxies.cpp',
-    'nsUrlClassifierStreamUpdater.cpp',
     'nsUrlClassifierUtils.cpp',
     'ProtocolParser.cpp',
 ]
 
+SOURCES += [
+    'nsUrlClassifierPrefixSet.cpp',
+    'nsUrlClassifierStreamUpdater.cpp',
+]
+
+# contains variables that conflict with LookupCache.cpp
+SOURCES += [
+    'HashStore.cpp',
+]
+
 EXTRA_COMPONENTS += [
     'nsURLClassifier.manifest',
     'nsUrlClassifierHashCompleter.js',