Work in progress: Complete browser-state migration

.buildconfig.yml

@@ -211,10 +211,6 @@ projects:
     path: components/browser/menu2
     description: 'An immutable customizable menu for browsers.'
     publish: true
-  browser-session:
-    path: components/browser/session
-    description: 'An abstract layer hiding the actual browser engine implementation.'
-    publish: true
   browser-session-storage:
     path: components/browser/session-storage
     description: 'Component for saving and restoring the browser state.'

CODEOWNERS

@@ -39,7 +39,6 @@
 /components/browser/menu/                   @mozilla-mobile/act
 /components/browser/menu2/                  @jonalmeida
 /components/browser/search/                 @pocmo
-/components/browser/session/                @pocmo @csadilek
 /components/browser/state/                  @pocmo @csadilek
 /components/browser/storage-memory/         @grigoryk
 /components/browser/storage-sync/           @grigoryk

README.md

@@ -80,10 +80,10 @@ High-level components for building browser(-like) apps.
 
 * ⚪ [**Menu 2**](components/browser/menu2/README.md) - A generic menu with customizable items primarily for browser toolbars.
 
-* 🔵 [**Session**](components/browser/session/README.md) - A generic representation of a browser session.
-
 * 🔵 [**Session-Storage**](components/browser/session-storage/README.md) - Component for saving and restoring the browser state.
 
+* 🔵 [**State**](components/browser/state/README.md) - Component for maintaining the centralized state of the browser and its components.
+
 * 🔵 [**Storage-Memory**](components/browser/storage-memory/README.md) - An in-memory implementation of browser storage.
 
 * 🔵 [**Storage-Sync**](components/browser/storage-sync/README.md) - A syncable implementation of browser storage backed by [application-services' Places lib](https://github.com/mozilla/application-services).

components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt

@@ -538,9 +538,7 @@ class GeckoEngineSession(
         ): GeckoResult<GeckoSession> {
             val newEngineSession = GeckoEngineSession(runtime, privateMode, defaultSettings, openGeckoSession = false)
             notifyObservers {
-                MainScope().launch {
-                    onWindowRequest(GeckoWindowRequest(uri, newEngineSession))
-                }
+                onWindowRequest(GeckoWindowRequest(uri, newEngineSession))
             }
             return GeckoResult.fromValue(newEngineSession.geckoSession)
         }

components/browser/session-storage/build.gradle

@@ -48,7 +48,6 @@ dependencies {
 
     testImplementation project(':support-test')
     testImplementation project(':support-test-libstate')
-    testImplementation project(':browser-session')
     testImplementation project(':feature-tabs')
     testImplementation Dependencies.androidx_test_core
     testImplementation Dependencies.androidx_test_junit
@@ -58,7 +57,6 @@ dependencies {
 
     androidTestImplementation project(':browser-engine-gecko')
     androidTestImplementation project(':support-android-test')
-    androidTestImplementation project(':browser-session')
     androidTestImplementation project(':feature-tabs')
     androidTestImplementation Dependencies.androidx_test_core
     androidTestImplementation Dependencies.androidx_test_runner

components/browser/session-storage/src/androidTest/java/mozilla/components/browser/session/storage/FullRestoreTest.kt

@@ -9,9 +9,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import mozilla.components.browser.engine.gecko.GeckoEngine
-import mozilla.components.browser.session.Session
-import mozilla.components.browser.session.SessionManager
-import mozilla.components.browser.session.engine.EngineMiddleware
+import mozilla.components.browser.state.engine.EngineMiddleware
 import mozilla.components.browser.state.selector.selectedTab
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.concept.engine.Engine
@@ -45,9 +43,8 @@ class FullRestoreTest {
             // Set up
             // -------------------------------------------------------------------------------------
 
-            val (sessionManager, store) = createSessionManagerAndStore(engine)
-
-            val tabsUseCases = TabsUseCases(store, sessionManager)
+            val store = createStore(engine)
+            val tabsUseCases = TabsUseCases(store)
 
             // -------------------------------------------------------------------------------------
             // Add a tab
@@ -74,8 +71,8 @@ class FullRestoreTest {
 
             val storage = SessionStorage(context, engine)
 
-            val (newSessionManager, newStore) = createSessionManagerAndStore(engine)
-            val newUseCases = TabsUseCases(newStore, newSessionManager)
+            val newStore = createStore(engine)
+            val newUseCases = TabsUseCases(newStore)
 
             assertNull(newStore.state.selectedTab)
 
@@ -94,28 +91,15 @@ class FullRestoreTest {
         }
     }
 
-    private fun createSessionManagerAndStore(
+    private fun createStore(
         engine: Engine
-    ): Pair<SessionManager, BrowserStore> {
+    ): BrowserStore {
         return runBlocking(Dispatchers.Main) {
-            val lookup = SessionManagerLookup()
-
-            val store = BrowserStore(middleware = EngineMiddleware.create(engine, lookup::lookup))
-
-            val sessionManager = SessionManager(engine, store)
-            lookup.sessionManager = sessionManager
-
-            Pair(sessionManager, store)
+            BrowserStore(middleware = EngineMiddleware.create(engine))
         }
     }
 }
 
-private class SessionManagerLookup {
-    var sessionManager: SessionManager? = null
-
-    fun lookup(tabId: String): Session? = sessionManager!!.findSessionById(tabId)
-}
-
 private fun waitFor(timeoutMs: Long = 10000, cadence: Long = 100, predicate: () -> Boolean) {
     val start = SystemClock.elapsedRealtime()