From f5c5b60a426cb0cbfb05a82efd7da49c10463cac Mon Sep 17 00:00:00 2001 From: "timeless%mozdev.org" Date: Wed, 12 Sep 2007 17:51:47 +0000 Subject: [PATCH] Bug 337917 Make consumers stop using cids from other modules git-svn-id: svn://10.0.0.236/trunk@235902 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/suite/browser/src/nsBookmarksService.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mozilla/suite/browser/src/nsBookmarksService.cpp b/mozilla/suite/browser/src/nsBookmarksService.cpp index 2c5e882551b..9ae83018e19 100644 --- a/mozilla/suite/browser/src/nsBookmarksService.cpp +++ b/mozilla/suite/browser/src/nsBookmarksService.cpp @@ -163,8 +163,6 @@ static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); static NS_DEFINE_CID(kRDFContainerCID, NS_RDFCONTAINER_CID); static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID); -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); -static NS_DEFINE_CID(kCacheServiceCID, NS_CACHESERVICE_CID); #define URINC_BOOKMARKS_TOPROOT_STRING "NC:BookmarksTopRoot" #define URINC_BOOKMARKS_ROOT_STRING "NC:BookmarksRoot" @@ -1627,11 +1625,11 @@ nsBookmarksService::Init() rv = bm_AddRefGlobals(); if (NS_FAILED(rv)) return rv; - mNetService = do_GetService(kIOServiceCID, &rv); + mNetService = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; // create cache service/session, ignoring errors - mCacheService = do_GetService(kCacheServiceCID, &rv); + mCacheService = do_GetService(NS_CACHESERVICE_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) { rv = mCacheService->CreateSession("HTTP", nsICache::STORE_ANYWHERE,