diff options
Diffstat (limited to 'chromium/chrome/browser/extensions/api/sessions')
| -rw-r--r-- | chromium/chrome/browser/extensions/api/sessions/sessions_api.cc | 8 | ||||
| -rw-r--r-- | chromium/chrome/browser/extensions/api/sessions/sessions_apitest.cc | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/chromium/chrome/browser/extensions/api/sessions/sessions_api.cc b/chromium/chrome/browser/extensions/api/sessions/sessions_api.cc index f130eced5de..fa30a4353f0 100644 --- a/chromium/chrome/browser/extensions/api/sessions/sessions_api.cc +++ b/chromium/chrome/browser/extensions/api/sessions/sessions_api.cc @@ -207,7 +207,7 @@ ExtensionFunction::ResponseAction SessionsGetRecentlyClosedFunction::Run() { TabRestoreServiceFactory::GetForProfile( Profile::FromBrowserContext(browser_context())); - // TabRestoreServiceFactory::GetForProfile() can return NULL (i.e., when in + // TabRestoreServiceFactory::GetForProfile() can return nullptr (i.e., when in // incognito mode) if (!tab_restore_service) { DCHECK(browser_context()->IsOffTheRecord()) @@ -521,7 +521,7 @@ ExtensionFunction::ResponseValue SessionsRestoreFunction::RestoreForeignSession( if (!open_tabs) return Error(kSessionSyncError); - const sessions::SessionTab* tab = NULL; + const sessions::SessionTab* tab = nullptr; if (open_tabs->GetForeignTab(session_id.session_tag(), SessionID::FromSerializedValue(session_id.id()), &tab)) { @@ -583,7 +583,7 @@ ExtensionFunction::ResponseAction SessionsRestoreFunction::Run() { SessionsEventRouter::SessionsEventRouter(Profile* profile) : profile_(profile), tab_restore_service_(TabRestoreServiceFactory::GetForProfile(profile)) { - // TabRestoreServiceFactory::GetForProfile() can return NULL (i.e., when in + // TabRestoreServiceFactory::GetForProfile() can return nullptr (i.e., when in // incognito mode) if (tab_restore_service_) { tab_restore_service_->LoadTabsFromLastSession(); @@ -606,7 +606,7 @@ void SessionsEventRouter::TabRestoreServiceChanged( void SessionsEventRouter::TabRestoreServiceDestroyed( sessions::TabRestoreService* service) { - tab_restore_service_ = NULL; + tab_restore_service_ = nullptr; } SessionsAPI::SessionsAPI(content::BrowserContext* context) diff --git a/chromium/chrome/browser/extensions/api/sessions/sessions_apitest.cc b/chromium/chrome/browser/extensions/api/sessions/sessions_apitest.cc index 36e74916715..71097a37fc8 100644 --- a/chromium/chrome/browser/extensions/api/sessions/sessions_apitest.cc +++ b/chromium/chrome/browser/extensions/api/sessions/sessions_apitest.cc @@ -297,9 +297,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionSessionsTest, GetDevicesListEmpty) { EXPECT_EQ(0u, devices->GetSize()); } -// Flaky timeout: http://crbug.com/278372 -IN_PROC_BROWSER_TEST_F(ExtensionSessionsTest, - DISABLED_RestoreForeignSessionWindow) { +IN_PROC_BROWSER_TEST_F(ExtensionSessionsTest, RestoreForeignSessionWindow) { CreateSessionModels(); std::unique_ptr<base::DictionaryValue> restored_window_session( |