diff -r 000000000000 -r 6474c204b198 browser/base/content/test/general/browser_bookmark_titles.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/browser/base/content/test/general/browser_bookmark_titles.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,86 @@
+/* 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/. */
+
+// This file is tests for the default titles that new bookmarks get.
+
+let tests = [
+    // Common page.
+    ['http://example.com/browser/browser/base/content/test/general/dummy_page.html',
+     'Dummy test page'],
+    // Data URI.
+    ['data:text/html;charset=utf-8,<title>test%20data:%20url</title>',
+     'test data: url'],
+    // about:neterror
+    ['data:application/vnd.mozilla.xul+xml,',
+     'data:application/vnd.mozilla.xul+xml,'],
+    // about:certerror
+    ['https://untrusted.example.com/somepage.html',
+     'https://untrusted.example.com/somepage.html']
+];
+
+function generatorTest() {
+    gBrowser.selectedTab = gBrowser.addTab();
+    let browser = gBrowser.selectedBrowser;
+    browser.stop(); // stop the about:blank load.
+
+    browser.addEventListener("DOMContentLoaded", event => {
+        if (event.originalTarget != browser.contentDocument ||
+            event.target.location.href == "about:blank") {
+            info("skipping spurious load event");
+            return;
+        }
+        nextStep();
+    }, true);
+    registerCleanupFunction(function () {
+        browser.removeEventListener("DOMContentLoaded", nextStep, true);
+        gBrowser.removeCurrentTab();
+    });
+
+    // Test that a bookmark of each URI gets the corresponding default title.
+    for (let i = 0; i < tests.length; ++i) {
+        let [uri, title] = tests[i];
+        content.location = uri;
+        yield undefined;
+        checkBookmark(uri, title);
+    }
+
+    // Network failure test: now that dummy_page.html is in history, bookmarking
+    // it should give the last known page title as the default bookmark title.
+
+    // Simulate a network outage with offline mode. (Localhost is still
+    // accessible in offline mode, so disable the test proxy as well.)
+    BrowserOffline.toggleOfflineStatus();
+    let proxy = Services.prefs.getIntPref('network.proxy.type');
+    Services.prefs.setIntPref('network.proxy.type', 0);
+    registerCleanupFunction(function () {
+        BrowserOffline.toggleOfflineStatus();
+        Services.prefs.setIntPref('network.proxy.type', proxy);
+    });
+
+    // LOAD_FLAGS_BYPASS_CACHE isn't good enough. So clear the cache.
+    Services.cache2.clear();
+
+    let [uri, title] = tests[0];
+    content.location = uri;
+    yield undefined;
+    // The offline mode test is only good if the page failed to load.
+    is(content.document.documentURI.substring(0, 14), 'about:neterror',
+        "Offline mode successfully simulated network outage.");
+    checkBookmark(uri, title);
+}
+
+// Bookmark the current page and confirm that the new bookmark has the expected
+// title. (Then delete the bookmark.)
+function checkBookmark(uri, expected_title) {
+    is(gBrowser.selectedBrowser.currentURI.spec, uri,
+       "Trying to bookmark the expected uri");
+    PlacesCommandHook.bookmarkCurrentPage(false);
+
+    let id = PlacesUtils.getMostRecentBookmarkForURI(PlacesUtils._uri(uri));
+    ok(id > 0, "Found the expected bookmark");
+    let title = PlacesUtils.bookmarks.getItemTitle(id);
+    is(title, expected_title, "Bookmark got a good default title.");
+
+    PlacesUtils.bookmarks.removeItem(id);
+}