зеркало из https://github.com/mozilla/pjs.git
followup to 202517 patch by dwitte@stanford.edu r=biesi remove some unused code from TestCookie.cpp and remove now-unneeded dependency on intl; affects TestCookie only
This commit is contained in:
Родитель
32b722c132
Коммит
647a324089
|
@ -1,46 +0,0 @@
|
|||
#
|
||||
# The contents of this file are subject to the Netscape Public
|
||||
# License Version 1.1 (the "License"); you may not use this file
|
||||
# except in compliance with the License. You may obtain a copy of
|
||||
# the License at http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS
|
||||
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
# implied. See the License for the specific language governing
|
||||
# rights and limitations under the License.
|
||||
#
|
||||
# The Original Code is mozilla.org code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
necko \
|
||||
intl \
|
||||
pref \
|
||||
$(NULL)
|
||||
|
||||
PROGRAM = TestCookie$(BIN_SUFFIX)
|
||||
CPPSRCS = TestCookie.cpp
|
||||
|
||||
LIBS = $(XPCOM_LIBS) $(NSPR_LIBS)
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
MAPFILE = TestCookie.map
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
@ -42,8 +42,6 @@
|
|||
#include "plstr.h"
|
||||
#include "nsNetUtil.h"
|
||||
#include "nsXPIDLString.h"
|
||||
#include "nsIEventQueueService.h"
|
||||
#include "nsIStringBundle.h"
|
||||
#include "nsIPrefBranch.h"
|
||||
#include "nsIPrefService.h"
|
||||
|
||||
|
@ -174,15 +172,6 @@ main(PRInt32 argc, char *argv[])
|
|||
nsresult rv0 = NS_InitXPCOM2(nsnull, nsnull, nsnull);
|
||||
if (NS_FAILED(rv0)) return -1;
|
||||
|
||||
nsCOMPtr<nsIStringBundleService> bundleService =
|
||||
do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv0);
|
||||
if (NS_SUCCEEDED(rv0))
|
||||
{
|
||||
nsCOMPtr<nsIStringBundle> stringBundle;
|
||||
const char propertyURL[] = "chrome://necko/locale/necko.properties";
|
||||
rv0 = bundleService->CreateBundle(propertyURL, getter_AddRefs(stringBundle));
|
||||
}
|
||||
|
||||
nsCOMPtr<nsICookieService> cookieService =
|
||||
do_GetService(kCookieServiceCID, &rv0);
|
||||
if (NS_FAILED(rv0)) return -1;
|
||||
|
|
Загрузка…
Ссылка в новой задаче