mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 737846 - Ensure favicons service doesn't add unwanted pages to history. 

r=dietrich
This commit is contained in:
Marco Bonardo 2012-03-27 15:28:14 +02:00
Родитель 36021219b1
Коммит 00c5a4d4d9
17 изменённых файлов: 300 добавлений и 223 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

32
toolkit/components/places/AsyncFaviconHelpers.cpp
Просмотреть файл

@ -794,37 +794,15 @@ AsyncAssociateIconToPage::Run()
NS_ENSURE_SUCCESS(rv, rv);
}
// If the page does not have an id, try to insert a new one.
// If the page does not have an id, don't try to insert a new one, cause we
// don't know where the page comes from. Not doing so we may end adding
// a page that otherwise we'd explicitly ignore, like a POST or an error page.
if (mPage.id == 0) {
nsCOMPtr<mozIStorageStatement> stmt = mDB->GetStatement(
"INSERT INTO moz_places (url, rev_host, hidden, favicon_id, frecency, guid) "
"VALUES (:page_url, :rev_host, 1, :favicon_id, 0, GENERATE_GUID()) "
);
NS_ENSURE_STATE(stmt);
mozStorageStatementScoper scoper(stmt);
rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("page_url"), mPage.spec);
NS_ENSURE_SUCCESS(rv, rv);
// The rev_host can be null.
if (mPage.revHost.IsEmpty()) {
rv = stmt->BindNullByName(NS_LITERAL_CSTRING("rev_host"));
return NS_OK;
}
else {
rv = stmt->BindStringByName(NS_LITERAL_CSTRING("rev_host"), mPage.revHost);
}
NS_ENSURE_SUCCESS(rv, rv);
rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("favicon_id"), mIcon.id);
NS_ENSURE_SUCCESS(rv, rv);
rv = stmt->Execute();
NS_ENSURE_SUCCESS(rv, rv);
// Get the new id and GUID.
rv = FetchPageInfo(mDB, mPage);
NS_ENSURE_SUCCESS(rv, rv);
mIcon.status |= ICON_STATUS_ASSOCIATED;
}
// Otherwise just associate the icon to the page, if needed.
else if (mPage.iconId != mIcon.id) {
if (mPage.iconId != mIcon.id) {
nsCOMPtr<mozIStorageStatement> stmt;
if (mPage.id) {
stmt = mDB->GetStatement(

4
toolkit/components/places/mozIAsyncFavicons.idl
Просмотреть файл

@ -60,8 +60,8 @@ interface mozIAsyncFavicons : nsISupports
* cache we won't do anything unless aForceReload is true, in which case
* we'll try to reload the favicon.
*
* This function will only save favicons for "good" URIs, as defined by what
* gets added to history or is a bookmark. For "bad" URIs, this function
* This function will only save favicons for pages that are already stored in
* the database, like visited pages or bookmarks. For any other URIs, it
* will succeed but do nothing. This function will also ignore the error
* page favicon URI (see FAVICON_ERRORPAGE_URL below).
*

5
toolkit/components/places/nsFaviconService.cpp
Просмотреть файл

@ -320,8 +320,11 @@ nsFaviconService::SetFaviconUrlForPage(nsIURI* aPageURI, nsIURI* aFaviconURI)
// Now, link our icon entry with the page.
PRInt64 pageId;
nsCAutoString guid;
rv = history->GetOrCreateIdForPage(aPageURI, &pageId, guid);
rv = history->GetIdForPage(aPageURI, &pageId, guid);
NS_ENSURE_SUCCESS(rv, rv);
if (!pageId) {
return NS_ERROR_NOT_AVAILABLE;
}
nsCOMPtr<mozIStorageStatement> stmt = mDB->GetStatement(
"UPDATE moz_places SET favicon_id = :icon_id WHERE id = :page_id"

7
toolkit/components/places/nsIFaviconService.idl
Просмотреть файл

@ -50,9 +50,9 @@ interface nsIFaviconService : nsISupports
*
* Will create an entry linking the favicon URI to the page, regardless
* of whether we have data for that icon. You can populate it later with
* SetFaviconData. However, remember that any favicons not associated with a
* visited web page, a bookmark, or a "place:" URI, will be removed during
* expiration runs.
* SetFaviconData. However, remember that favicons must only be associated
* with a visited web page, a bookmark, or a "place:" URI. Trying to
* associate the icon to any other page will throw.
*
* This will send out history pageChanged notification if the new favicon has
* any data and it's different from the old associated favicon. This means
@ -63,6 +63,7 @@ interface nsIFaviconService : nsISupports
* URI of the page whose favicon is being set.
* @param aFaviconURI
* URI of the favicon to associate with the page.
* @throws NS_ERROR_NOT_AVAILABLE if aPageURI doesn't exist in the database.
*/
void setFaviconUrlForPage(in nsIURI aPageURI,
in nsIURI aFaviconURI);

3
toolkit/components/places/tests/chrome/Makefile.in
Просмотреть файл

@ -61,6 +61,8 @@ _CHROME_FILES = \
test_favicon_annotations.xul \
test_303567.xul \
test_381357.xul \
test_history_post.xul \
history_post.sjs \
test_reloadLivemarks.xul \
$(NULL)
@ -69,4 +71,3 @@ libs:: $(_HTTP_FILES)
libs:: $(_CHROME_FILES)
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)

6
toolkit/components/places/tests/chrome/history_post.sjs Normal file
Просмотреть файл

@ -0,0 +1,6 @@
function handleRequest(request, response)
{
response.setStatusLine("1.0", 200, "OK");
response.setHeader("Content-Type", "text/plain; charset=utf-8", false);
response.write("Ciao");
}

37
toolkit/components/places/tests/chrome/test_favicon_annotations.xul
Просмотреть файл

@ -135,6 +135,7 @@ function loadNextTest()
function test()
{
SimpleTest.waitForExplicitFinish();
let db = Cc["@mozilla.org/browser/nav-history-service;1"].
getService(Ci.nsPIPlacesDatabase).
DBConnection;
@ -148,19 +149,39 @@ function test()
return ios.newURI(aSpec, null, null);
};
// Set the favicon data. Note that the "moz-anno:" protocol requires the
// favicon to be stored in the database, but the replaceFaviconDataFromDataURL
// function will not save the favicon unless it is associated with a page.
// Thus, we must associate the icon with a page explicitly in order for it to
// be visible through the protocol.
let pageURI = uri("http://example.com/favicon_annotations");
let history = Cc["@mozilla.org/browser/history;1"]
.getService(Ci.mozIAsyncHistory);
history.updatePlaces(
{
uri: pageURI,
visits: [{ transitionType: Ci.nsINavHistoryService.TRANSITION_TYPED,
visitDate: Date.now() * 1000
}],
},
{
handleError: function UP_handleError() {
ok(false, "Unexpected error in adding visit.");
},
handleResult: function () {},
handleCompletion: function UP_handleCompletion() {
// Set the favicon data. Note that the "moz-anno:" protocol requires
// the favicon to be stored in the database, but the
// replaceFaviconDataFromDataURL function will not save the favicon
// unless it is associated with a page. Thus, we must associate the
// icon with a page explicitly in order for it to be visible through
// the protocol.
fs.replaceFaviconDataFromDataURL(uri(testURIs[1]), expectedURIs[1],
(Date.now() + 60 * 60 * 24 * 1000) * 1000);
fs.setAndFetchFaviconForPage(uri("http://example.com/favicon_annotations"),
uri(testURIs[1]), true);
fs.setAndFetchFaviconForPage(pageURI, uri(testURIs[1]), true);
// And start our test process.
loadNextTest();
SimpleTest.waitForExplicitFinish();
}
}
});
}
]]>

67
toolkit/components/places/tests/chrome/test_history_post.xul Normal file
Просмотреть файл

@ -0,0 +1,67 @@
<?xml version="1.0"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
<window title="Test post pages are not added to history"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="test();">
<script type="application/javascript"
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
<script type="application/javascript"
src="chrome://mochikit/content/tests/SimpleTest/WindowSnapshot.js"/>
<script type="application/javascript"
src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
<script type="application/javascript">
<![CDATA[
const Cc = Components.classes;
const Ci = Components.interfaces;
Components.utils.import("resource://gre/modules/PlacesUtils.jsm");
Components.utils.import("resource://gre/modules/NetUtil.jsm");
const SJS_URI = NetUtil.newURI("http://mochi.test:8888/tests/toolkit/components/places/tests/chrome/history_post.sjs");
function test()
{
SimpleTest.waitForExplicitFinish();
let submit = document.getElementById("submit");
submit.click();
let iframe = document.getElementById("post_iframe");
iframe.addEventListener("load", function onLoad() {
iframe.removeEventListener("load", onLoad);
let history = Cc["@mozilla.org/browser/history;1"]
.getService(Ci.mozIAsyncHistory);
history.isURIVisited(SJS_URI, function (aURI, aIsVisited) {
ok(!aIsVisited, "The POST page should not be added to history");
let db = PlacesUtils.history.QueryInterface(Ci.nsPIPlacesDatabase)
.DBConnection;
let stmt = db.createStatement(
"SELECT 1 FROM moz_places WHERE url = :page_url"
);
stmt.params.page_url = SJS_URI.spec;
ok(!stmt.executeStep(), "The page should not be in the database");
stmt.finalize();
SimpleTest.finish();
});
});
}
]]>
</script>
<body xmlns="http://www.w3.org/1999/xhtml">
<iframe name="post_iframe" id="post_iframe"/>
<form method="post" action="http://mochi.test:8888/tests/toolkit/components/places/tests/chrome/history_post.sjs" target="post_iframe">
<input type="submit" id="submit"/>
</form>
<p id="display"></p>
<div id="content" style="display:none;"></div>
<pre id="test"></pre>
</body>
</window>

17
toolkit/components/places/tests/favicons/test_expireAllFavicons.js
Просмотреть файл

@ -8,10 +8,6 @@
////////////////////////////////////////////////////////////////////////////////
/// Globals
XPCOMUtils.defineLazyServiceGetter(this, "gHistory",
"@mozilla.org/browser/history;1",
"mozIAsyncHistory");
const TEST_PAGE_URI = NetUtil.newURI("http://example.com/");
const BOOKMARKED_PAGE_URI = NetUtil.newURI("http://example.com/bookmarked");
@ -36,17 +32,7 @@ add_test(function test_expireAllFavicons() {
}, PlacesUtils.TOPIC_FAVICONS_EXPIRED, false);
// Add a visited page.
gHistory.updatePlaces({
uri: TEST_PAGE_URI,
visits: [{
transitionType: Ci.nsINavHistoryService.TRANSITION_TYPED,
visitDate: Date.now() * 1000
}]
}, {
handleError: function EAF_handleError(aResultCode, aPlaceInfo) {
do_throw("Unexpected error: " + aResultCode);
},
handleResult: function EAF_handleResult(aPlaceInfo) {
addVisits({ uri: TEST_PAGE_URI, transition: TRANSITION_TYPED }, function () {
PlacesUtils.favicons.setAndFetchFaviconForPage(TEST_PAGE_URI,
SMALLPNG_DATA_URI, true);
@ -61,6 +47,5 @@ add_test(function test_expireAllFavicons() {
// Start expiration only after data has been saved in the database.
PlacesUtils.favicons.expireAllFavicons();
});
}
});
});

9
toolkit/components/places/tests/favicons/test_favicons.js
Просмотреть файл

@ -304,6 +304,15 @@ add_test(function test_insert_asynchronous_update_preserves_guid() {
}));
});
add_test(function test_setFaviconURLForPage_nonexistingPage_throws() {
try {
PlacesUtils.favicons.setFaviconUrlForPage(
NetUtil.newURI("http://nonexisting.moz.org"), icons[0].uri);
do_throw("Setting an icon for a nonexisting page should throw")
} catch (ex if ex.result == Cr.NS_ERROR_NOT_AVAILABLE) {}
run_next_test();
});
/*
* TODO: need a test for async write that modifies a GUID for a favicon.
* This will come later, when there's an API that actually does that!

2
toolkit/components/places/tests/favicons/test_favicons_conversions.js
Просмотреть файл

@ -34,6 +34,7 @@ function checkFaviconDataConversion(aFileName, aFileMimeType, aFileLength,
aExpectConversion, aVaryOnWindows,
aCallback) {
let pageURI = NetUtil.newURI("http://places.test/page/" + aFileName);
addVisits({ uri: pageURI, transition: TRANSITION_TYPED }, function () {
let faviconURI = NetUtil.newURI("http://places.test/icon/" + aFileName);
let fileData = readFileOfLength(aFileName, aFileLength);
@ -54,6 +55,7 @@ function checkFaviconDataConversion(aFileName, aFileMimeType, aFileLength,
aCallback();
});
});
}
////////////////////////////////////////////////////////////////////////////////

5
toolkit/components/places/tests/favicons/test_setAndFetchFaviconForPage.js
Просмотреть файл

@ -27,13 +27,14 @@ add_test(function test_normal()
let pageURI = NetUtil.newURI("http://example.com/normal");
waitForFaviconChanged(pageURI, FAVICON_URI,
function test_normal_callback() {
do_check_true(isUrlHidden(pageURI));
do_check_eq(frecencyForUrl(pageURI), 0);
checkFaviconDataForPage(pageURI, FAVICON_MIMETYPE, FAVICON_DATA,
run_next_test);
});
addVisits({ uri: pageURI, transition: TRANSITION_TYPED}, function () {
PlacesUtils.favicons.setAndFetchFaviconForPage(pageURI, FAVICON_URI, true);
});
});
add_test(function test_aboutURI_bookmarked()
{

27
toolkit/components/places/tests/favicons/test_setAndFetchFaviconForPage_failures.js
Просмотреть файл

@ -91,6 +91,8 @@ add_test(function test_privateBrowsing_nonBookmarkedURI()
return;
}
let pageURI = NetUtil.newURI("http://example.com/privateBrowsing");
addVisits({ uri: pageURI, transitionType: TRANSITION_TYPED }, function () {
let pb = Cc["@mozilla.org/privatebrowsing;1"]
.getService(Ci.nsIPrivateBrowsingService);
Services.prefs.setBoolPref("browser.privatebrowsing.keep_current_session",
@ -98,7 +100,7 @@ add_test(function test_privateBrowsing_nonBookmarkedURI()
pb.privateBrowsingEnabled = true;
PlacesUtils.favicons.setAndFetchFaviconForPage(
NetUtil.newURI("http://example.com/privateBrowsing"),
pageURI,
FAVICON_URI, true);
// The setAndFetchFaviconForPage function calls CanAddURI synchronously,
@ -107,13 +109,16 @@ add_test(function test_privateBrowsing_nonBookmarkedURI()
Services.prefs.clearUserPref("browser.privatebrowsing.keep_current_session");
run_next_test();
});
});
add_test(function test_disabledHistory()
{
let pageURI = NetUtil.newURI("http://example.com/disabledHistory");
addVisits({ uri: pageURI, transition: TRANSITION_TYPED }, function () {
Services.prefs.setBoolPref("places.history.enabled", false);
PlacesUtils.favicons.setAndFetchFaviconForPage(
NetUtil.newURI("http://example.com/disabledHistory"),
pageURI,
FAVICON_URI, true);
// The setAndFetchFaviconForPage function calls CanAddURI synchronously, thus
@ -122,22 +127,38 @@ add_test(function test_disabledHistory()
Services.prefs.setBoolPref("places.history.enabled", true);
run_next_test();
});
});
add_test(function test_errorIcon()
{
let pageURI = NetUtil.newURI("http://example.com/errorIcon");
let places = [{ uri: pageURI, transition: TRANSITION_TYPED }];
addVisits({ uri: pageURI, transition: TRANSITION_TYPED }, function () {
PlacesUtils.favicons.setAndFetchFaviconForPage(
NetUtil.newURI("http://example.com/errorIcon"),
pageURI,
FAVICON_ERRORPAGE_URI, true);
run_next_test();
});
});
add_test(function test_nonexistingPage()
{
PlacesUtils.favicons.setAndFetchFaviconForPage(
NetUtil.newURI("http://example.com/nonexistingPage"),
FAVICON_URI, true);
run_next_test();
});
add_test(function test_finalVerification()
{
// This is the only test that should cause the waitForFaviconChanged callback
// we set up earlier to be invoked. In turn, the callback will invoke
// run_next_test() causing the tests to finish.
addVisits({ uri: LAST_PAGE_URI, transition: TRANSITION_TYPED }, function () {
PlacesUtils.favicons.setAndFetchFaviconForPage(
LAST_PAGE_URI,
LAST_FAVICON_URI, true);
});
});

58
toolkit/components/places/tests/head_common.js
Просмотреть файл

@ -870,3 +870,61 @@ NavHistoryResultObserver.prototype = {
Ci.nsINavHistoryResultObserver,
])
};
/**
* Asynchronously adds visits to a page, invoking a callback function when done.
*
* @param aPlaceInfo
* Can be an nsIURI, in such a case a single LINK visit will be added.
* Otherwise can be an object describing the visit to add, or an array
* of these objects:
* { uri: nsIURI of the page,
* transition: one of the TRANSITION_* from nsINavHistoryService,
* [optional] title: title of the page,
* [optional] visitDate: visit date in microseconds from the epoch
* }
* @param [optional] aCallback
* Function to be invoked on completion.
* @param [optional] aStack
* The stack frame used to report errors.
*/
function addVisits(aPlaceInfo, aCallback, aStack)
{
let stack = aStack || Components.stack.caller;
let places = [];
if (aPlaceInfo instanceof Ci.nsIURI) {
places.push({ uri: aPlaceInfo });
}
else if (Array.isArray(aPlaceInfo)) {
places = places.concat(aPlaceInfo);
} else {
places.push(aPlaceInfo)
}
// Create mozIVisitInfo for each entry.
let now = Date.now();
for (let i = 0; i < places.length; i++) {
if (!places[i].title) {
places[i].title = "test visit for " + places[i].uri.spec;
}
places[i].visits = [{
transitionType: places[i].transition === undefined ? TRANSITION_LINK
: places[i].transition,
visitDate: places[i].visitDate || (now++) * 1000
}];
}
PlacesUtils.asyncHistory.updatePlaces(
places,
{
handleError: function AAV_handleError() {
do_throw("Unexpected error in adding visit.", stack);
},
handleResult: function () {},
handleCompletion: function UP_handleCompletion() {
if (aCallback)
aCallback();
}
}
);
}

23
toolkit/components/places/tests/inline/head_autocomplete.js
Просмотреть файл

@ -193,26 +193,3 @@ function addBookmark(aBookmarkObj) {
PlacesUtils.bookmarks.setKeywordForBookmark(itemId, aBookmarkObj.keyword);
}
}
function VisitInfo(aTransitionType, aVisitTime)
{
this.transitionType =
aTransitionType === undefined ? TRANSITION_LINK : aTransitionType;
this.visitDate = aVisitTime || Date.now() * 1000;
}
function addVisits(aUrls)
{
let places = [];
aUrls.forEach(function(url) {
places.push({
uri: url.url,
title: "test for " + url.url,
visits: [
new VisitInfo(url.transition),
],
});
});
gHistory.updatePlaces(places);
}

75
toolkit/components/places/tests/inline/test_autocomplete_functional.js
Просмотреть файл

@ -10,13 +10,10 @@ add_autocomplete_test([
"visit2.mozilla.org/",
function ()
{
let urls = [{ url: NetUtil.newURI("http://visit1.mozilla.org"),
transition: undefined,
},
{ url: NetUtil.newURI("http://visit2.mozilla.org"),
transition: TRANSITION_TYPED,
}];
addVisits(urls);
let places = [{ uri: NetUtil.newURI("http://visit1.mozilla.org") },
{ uri: NetUtil.newURI("http://visit2.mozilla.org"),
transition: TRANSITION_TYPED }];
addVisits(places);
}
]);
@ -26,12 +23,7 @@ add_autocomplete_test([
"visit1.mozilla.org/",
function ()
{
let urls = [{ url: NetUtil.newURI("http://www.visit1.mozilla.org"),
transition: undefined,
},
];
addVisits(urls);
addVisits(NetUtil.newURI("http://www.visit1.mozilla.org"));
}
]);
@ -41,12 +33,7 @@ add_autocomplete_test([
"visit3.mozilla.org/",
function ()
{
let urls = [{ url: NetUtil.newURI("http://www.visit3.mozilla.org"),
transition: undefined,
},
];
addVisits(urls);
addVisits(NetUtil.newURI("http://www.visit3.mozilla.org"));
}
]);
@ -56,12 +43,7 @@ add_autocomplete_test([
"www.me.mozilla.org/",
function ()
{
let urls = [{ url: NetUtil.newURI("http://www.me.mozilla.org"),
transition: undefined,
},
];
addVisits(urls);
addVisits(NetUtil.newURI("http://www.me.mozilla.org"));
}
]);
@ -71,13 +53,8 @@ add_autocomplete_test([
"bookmark1.mozilla.org/",
function ()
{
let urls = [{ url: NetUtil.newURI("http://bookmark1.mozilla.org/foo"),
transition: undefined,
},
];
addBookmark({ url: "http://bookmark1.mozilla.org/", });
addVisits(urls);
addVisits(NetUtil.newURI("http://bookmark1.mozilla.org/foo"));
}
]);
@ -88,14 +65,9 @@ add_autocomplete_test([
function ()
{
let urls = [{ url: NetUtil.newURI("http://smokey.mozilla.org/foo/bar/baz?bacon=delicious"),
transition: undefined,
},
{ url: NetUtil.newURI("http://smokey.mozilla.org/foo/bar/baz?bacon=smokey"),
transition: undefined,
},
];
addVisits(urls);
let places = [{ uri: NetUtil.newURI("http://smokey.mozilla.org/foo/bar/baz?bacon=delicious") },
{ uri: NetUtil.newURI("http://smokey.mozilla.org/foo/bar/baz?bacon=smokey") }];
addVisits(places);
}
]);
@ -106,14 +78,9 @@ add_autocomplete_test([
function ()
{
let urls = [{ url: NetUtil.newURI("http://smokey.mozilla.org/foo/bar/baz?bacon=delicious"),
transition: undefined,
},
{ url: NetUtil.newURI("http://smokey.mozilla.org/foo/bar/baz?bacon=smokey"),
transition: undefined,
},
];
addVisits(urls);
let places = [{ uri: NetUtil.newURI("http://smokey.mozilla.org/foo/bar/baz?bacon=delicious") },
{ uri: NetUtil.newURI("http://smokey.mozilla.org/foo/bar/baz?bacon=smokey") }];
addVisits(places);
}
]);
@ -123,12 +90,7 @@ add_autocomplete_test([
"smokey.mozilla.org/foo?bacon=delicious",
function ()
{
let urls = [{ url: NetUtil.newURI("http://smokey.mozilla.org/foo?bacon=delicious"),
transition: undefined,
},
];
addVisits(urls);
addVisits(NetUtil.newURI("http://smokey.mozilla.org/foo?bacon=delicious"));
}
]);
@ -138,11 +100,6 @@ add_autocomplete_test([
"smokey.mozilla.org/foo?bacon=delicious#bar",
function ()
{
let urls = [{ url: NetUtil.newURI("http://smokey.mozilla.org/foo?bacon=delicious#bar"),
transition: undefined,
},
];
addVisits(urls);
addVisits(NetUtil.newURI("http://smokey.mozilla.org/foo?bacon=delicious#bar"));
}
]);

26
toolkit/components/places/tests/inline/test_typed.js
Просмотреть файл

@ -11,9 +11,7 @@ add_autocomplete_test([
"mozilla.org/",
function () {
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
addVisits([ { url: NetUtil.newURI("http://mozilla.org/link/")
, transition: TRANSITION_LINK }
]);
addVisits(NetUtil.newURI("http://mozilla.org/link/"));
}
]);
@ -23,9 +21,7 @@ add_autocomplete_test([
"mozilla.org/link/",
function () {
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", false);
addVisits([ { url: NetUtil.newURI("http://mozilla.org/link/")
, transition: TRANSITION_LINK }
]);
addVisits(NetUtil.newURI("http://mozilla.org/link/"));
}
]);
@ -37,9 +33,7 @@ add_autocomplete_test([
"moz",
function () {
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", true);
addVisits([ { url: NetUtil.newURI("http://mozilla.org/link/")
, transition: TRANSITION_LINK }
]);
addVisits(NetUtil.newURI("http://mozilla.org/link/"));
}
]);
@ -49,9 +43,8 @@ add_autocomplete_test([
"mozilla.org/",
function () {
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", true);
addVisits([ { url: NetUtil.newURI("http://mozilla.org/typed/")
, transition: TRANSITION_TYPED }
]);
addVisits({ uri: NetUtil.newURI("http://mozilla.org/typed/"),
transition: TRANSITION_TYPED });
}
]);
@ -61,9 +54,7 @@ add_autocomplete_test([
"mozilla.org/li",
function () {
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", true);
addVisits([ { url: NetUtil.newURI("http://mozilla.org/link/")
, transition: TRANSITION_LINK }
]);
addVisits(NetUtil.newURI("http://mozilla.org/link/"));
}
]);
@ -73,8 +64,7 @@ add_autocomplete_test([
"mozilla.org/link/",
function () {
Services.prefs.setBoolPref("browser.urlbar.autoFill.typed", true);
addVisits([ { url: NetUtil.newURI("http://mozilla.org/link/")
, transition: TRANSITION_TYPED }
]);
addVisits({ uri: NetUtil.newURI("http://mozilla.org/link/"),
transition: TRANSITION_TYPED });
}
]);