From 70cc02de178c10f7384416818bd7b8f815e4e170 Mon Sep 17 00:00:00 2001 From: Coroiu Cristina Date: Sun, 12 Nov 2017 00:13:33 +0200 Subject: [PATCH] Backed out changeset d3c111ae8e20 (bug 1415692) for leaks in windows clipboard tests a=backout r=backout --- .../base/content/test/performance/browser.ini | 3 -- .../tests/marionette/test_refresh_firefox.py | 26 ++----------- browser/components/nsBrowserGlue.js | 38 ------------------- browser/components/tests/browser/browser.ini | 1 - ...ser_default_bookmark_toolbar_visibility.js | 18 --------- 5 files changed, 4 insertions(+), 82 deletions(-) delete mode 100644 browser/components/tests/browser/browser_default_bookmark_toolbar_visibility.js diff --git a/browser/base/content/test/performance/browser.ini b/browser/base/content/test/performance/browser.ini index da50d74a19f3..5909b57e369e 100644 --- a/browser/base/content/test/performance/browser.ini +++ b/browser/base/content/test/performance/browser.ini @@ -1,8 +1,5 @@ [DEFAULT] prefs = - # Skip migration work in BG__migrateUI for browser_startup.js since it isn't - # representative of common startup. - browser.migration.version=9999999 browser.startup.record=true support-files = head.js diff --git a/browser/components/migration/tests/marionette/test_refresh_firefox.py b/browser/components/migration/tests/marionette/test_refresh_firefox.py index c5f8a4648c1f..fca0e2c4ce07 100644 --- a/browser/components/migration/tests/marionette/test_refresh_firefox.py +++ b/browser/components/migration/tests/marionette/test_refresh_firefox.py @@ -44,7 +44,7 @@ class TestFirefoxRefresh(MarionetteTestCase): Services.logins.addLogin(myLogin) """, script_args=(self._username, self._password)) - def createBookmarkInMenu(self): + def createBookmark(self): self.marionette.execute_script(""" let url = arguments[0]; let title = arguments[1]; @@ -52,14 +52,6 @@ class TestFirefoxRefresh(MarionetteTestCase): makeURI(url), 0, title); """, script_args=(self._bookmarkURL, self._bookmarkText)) - def createBookmarksOnToolbar(self): - self.marionette.execute_script(""" - for (let i = 1; i <= 5; i++) { - PlacesUtils.bookmarks.insertBookmark(PlacesUtils.toolbarFolderId, - makeURI(`about:rights?p=${i}`), 0, `Bookmark ${i}`); - } - """) - def createHistory(self): error = self.runAsyncCode(""" // Copied from PlacesTestUtils, which isn't available in Marionette tests. @@ -208,7 +200,7 @@ class TestFirefoxRefresh(MarionetteTestCase): # Note that we expect 2 logins - one from us, one from sync. self.assertEqual(loginCount, 2, "No other logins are present") - def checkBookmarkInMenu(self): + def checkBookmark(self): titleInBookmarks = self.marionette.execute_script(""" let url = arguments[0]; let bookmarkIds = PlacesUtils.bookmarks.getBookmarkIdsForURI(makeURI(url), {}, {}); @@ -216,14 +208,6 @@ class TestFirefoxRefresh(MarionetteTestCase): """, script_args=(self._bookmarkURL,)) self.assertEqual(titleInBookmarks, self._bookmarkText) - def checkBookmarkToolbarVisibility(self): - toolbarVisible = self.marionette.execute_script(""" - const BROWSER_DOCURL = "chrome://browser/content/browser.xul"; - let xulStore = Cc["@mozilla.org/xul/xulstore;1"].getService(Ci.nsIXULStore); - return xulStore.getValue(BROWSER_DOCURL, "PersonalToolbar", "collapsed") - """) - self.assertEqual(toolbarVisible, "false") - def checkHistory(self): historyResult = self.runAsyncCode(""" PlacesUtils.history.fetch(arguments[0]).then(pageInfo => { @@ -394,20 +378,18 @@ class TestFirefoxRefresh(MarionetteTestCase): def checkProfile(self, hasMigrated=False): self.checkPassword() - self.checkBookmarkInMenu() + self.checkBookmark() self.checkHistory() self.checkFormHistory() self.checkFormAutofill() self.checkCookie() self.checkSync(hasMigrated); if hasMigrated: - self.checkBookmarkToolbarVisibility() self.checkSession() def createProfileData(self): self.savePassword() - self.createBookmarkInMenu() - self.createBookmarksOnToolbar() + self.createBookmark() self.createHistory() self.createFormHistory() self.createFormAutofill() diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index 225057d1c0cd..ce6237b06d94 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -1743,35 +1743,6 @@ BrowserGlue.prototype = { this.AlertsService.showAlertNotification(null, title, body, true, null, clickCallback); }, - /** - * Uncollapses PersonalToolbar if its collapsed status is not - * persisted, and user customized it or changed default bookmarks. - * - * If the user does not have a persisted value for the toolbar's - * "collapsed" attribute, try to determine whether it's customized. - */ - _maybeToggleBookmarkToolbarVisibility() { - const BROWSER_DOCURL = "chrome://browser/content/browser.xul"; - const NUM_TOOLBAR_BOOKMARKS_TO_UNHIDE = 3; - let xulStore = Cc["@mozilla.org/xul/xulstore;1"].getService(Ci.nsIXULStore); - - if (!xulStore.hasValue(BROWSER_DOCURL, "PersonalToolbar", "collapsed")) { - // We consider the toolbar customized if it has more than NUM_TOOLBAR_BOOKMARKS_TO_UNHIDE - // children, or if it has a persisted currentset value. - let toolbarIsCustomized = xulStore.hasValue(BROWSER_DOCURL, "PersonalToolbar", "currentset"); - let getToolbarFolderCount = () => { - let toolbarFolder = PlacesUtils.getFolderContents(PlacesUtils.toolbarFolderId).root; - let toolbarChildCount = toolbarFolder.childCount; - toolbarFolder.containerOpen = false; - return toolbarChildCount; - }; - - if (toolbarIsCustomized || getToolbarFolderCount() > NUM_TOOLBAR_BOOKMARKS_TO_UNHIDE) { - xulStore.setValue(BROWSER_DOCURL, "PersonalToolbar", "collapsed", "false"); - } - } - }, - // eslint-disable-next-line complexity _migrateUI: function BG__migrateUI() { const UI_VERSION = 58; @@ -1783,15 +1754,6 @@ BrowserGlue.prototype = { } else { // This is a new profile, nothing to migrate. Services.prefs.setIntPref("browser.migration.version", UI_VERSION); - - try { - // New profiles may have existing bookmarks (imported from another browser or - // copied into the profile) and we want to show the bookmark toolbar for them - // in some cases. - this._maybeToggleBookmarkToolbarVisibility(); - } catch (ex) { - Cu.reportError(ex); - } return; } diff --git a/browser/components/tests/browser/browser.ini b/browser/components/tests/browser/browser.ini index e99fef91dd8b..d5b9a651a7e4 100644 --- a/browser/components/tests/browser/browser.ini +++ b/browser/components/tests/browser/browser.ini @@ -4,4 +4,3 @@ skip-if = !updater reason = test depends on update channel [browser_contentpermissionprompt.js] -[browser_default_bookmark_toolbar_visibility.js] diff --git a/browser/components/tests/browser/browser_default_bookmark_toolbar_visibility.js b/browser/components/tests/browser/browser_default_bookmark_toolbar_visibility.js deleted file mode 100644 index 0e79967171a9..000000000000 --- a/browser/components/tests/browser/browser_default_bookmark_toolbar_visibility.js +++ /dev/null @@ -1,18 +0,0 @@ -/* Any copyright is dedicated to the Public Domain. - * http://creativecommons.org/publicdomain/zero/1.0/ */ - -/** - * Test _maybeToggleBookmarkToolbarVisibility() code running for new profiles. - * Ensure that the bookmarks toolbar is hidden in a default configuration. - * If new default bookmarks are added to the toolbar then the threshold of > 3 - * in NUM_TOOLBAR_BOOKMARKS_TO_UNHIDE may need to be adjusted there. - */ -add_task(async function test_default_bookmark_toolbar_visibility() { - const BROWSER_DOCURL = "chrome://browser/content/browser.xul"; - let xulStore = Cc["@mozilla.org/xul/xulstore;1"].getService(Ci.nsIXULStore); - - is(xulStore.getValue(BROWSER_DOCURL, "PersonalToolbar", "collapsed"), "", - "Check that @collapsed isn't persisted"); - ok(document.getElementById("PersonalToolbar").collapsed, - "The bookmarks toolbar should be collapsed by default"); -});