[Feed v2] Java side of clear all feed data

Bug: none
Change-Id: I03cd5f3d360907d4bf5f8a733e95950e6a08e08d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2324616Reviewed-by: Dan H <harringtond@chromium.org>
Commit-Queue: Jian Li <jianli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792939}

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedServiceBridge.java

@@ -34,6 +34,11 @@ public final class FeedServiceBridge {
         return result;
     }
 
+    @CalledByNative
+    public static void clearAll() {
+        FeedStreamSurface.clearAll();
+    }
+
     /** Called at startup to trigger creation of |FeedService|. */
     public static void startup() {
         FeedServiceBridgeJni.get().startup();

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/v2/FeedStreamSurface.java

@@ -121,31 +121,59 @@ public class FeedStreamSurface implements SurfaceActionsHandler, FeedActionsHand
     // the correct sign-in state is used if attaching the surface triggers a fetch.
 
     private static boolean sStartupCalled;
-    private static HashSet<FeedStreamSurface> sWaitingSurfaces;
+    // Tracks all the surfaces that are waiting to be attached or already attached. When
+    // |sStartupCalled| is false, |startup()| has not been called and thus all the surfaces
+    // in this set are waiting to be attached. Otherwise, all the surfaces in this set are
+    // already attached.
+    private static HashSet<FeedStreamSurface> sSurfaces;
 
     public static void startup() {
         if (sStartupCalled) return;
         sStartupCalled = true;
         FeedServiceBridge.startup();
         xSurfaceProcessScope();
-        if (sWaitingSurfaces != null) {
-            for (FeedStreamSurface surface : sWaitingSurfaces) {
+        if (sSurfaces != null) {
+            for (FeedStreamSurface surface : sSurfaces) {
                 surface.surfaceOpened();
             }
-            sWaitingSurfaces = null;
         }
     }
 
-    private static void openSurfaceAtStartup(FeedStreamSurface surface) {
-        if (sWaitingSurfaces == null) {
-            sWaitingSurfaces = new HashSet<FeedStreamSurface>();
+    // Only called for cleanup during testing.
+    @VisibleForTesting
+    static void shutdownForTesting() {
+        sStartupCalled = false;
+        sSurfaces = null;
+        sXSurfaceProcessScope = null;
+    }
+
+    private static void trackSurface(FeedStreamSurface surface) {
+        if (sSurfaces == null) {
+            sSurfaces = new HashSet<FeedStreamSurface>();
         }
-        sWaitingSurfaces.add(surface);
+        sSurfaces.add(surface);
     }
 
-    private static void cancelOpenSurfaceAtStartup(FeedStreamSurface surface) {
-        if (sWaitingSurfaces != null) {
-            sWaitingSurfaces.remove(surface);
+    private static void untrackSurface(FeedStreamSurface surface) {
+        if (sSurfaces != null) {
+            sSurfaces.remove(surface);
+        }
+    }
+
+    /**
+     *  Clear all the data related to all surfaces.
+     */
+    public static void clearAll() {
+        if (sSurfaces != null) {
+            for (FeedStreamSurface surface : sSurfaces) {
+                surface.surfaceClosed();
+            }
+            sSurfaces = null;
+        }
+
+        ProcessScope processScope = xSurfaceProcessScope();
+        if (processScope != null) {
+            processScope.resetAccount();
         }
     }
 
@@ -645,9 +673,8 @@ public class FeedStreamSurface implements SurfaceActionsHandler, FeedActionsHand
      * the content is available, onStreamUpdated will be called.
      */
     public void surfaceOpened() {
-        if (!sStartupCalled) {
-            openSurfaceAtStartup(this);
-        } else {
+        trackSurface(this);
+        if (sStartupCalled) {
             FeedStreamSurfaceJni.get().surfaceOpened(
                     mNativeFeedStreamSurface, FeedStreamSurface.this);
         }
@@ -662,9 +689,8 @@ public class FeedStreamSurface implements SurfaceActionsHandler, FeedActionsHand
             mContentManager.removeContents(mHeaderCount, feedCount);
         }
 
-        if (!sStartupCalled) {
-            cancelOpenSurfaceAtStartup(this);
-        } else {
+        untrackSurface(this);
+        if (sStartupCalled) {
             FeedStreamSurfaceJni.get().surfaceClosed(
                     mNativeFeedStreamSurface, FeedStreamSurface.this);
         }

chrome/android/junit/src/org/chromium/chrome/browser/feed/v2/FeedStreamSurfaceTest.java

@@ -29,6 +29,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.protobuf.ByteString;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -45,12 +46,15 @@ import org.robolectric.annotation.Config;
 import org.chromium.base.Callback;
 import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.base.test.util.JniMocker;
+import org.chromium.chrome.browser.AppHooks;
+import org.chromium.chrome.browser.AppHooksImpl;
 import org.chromium.chrome.browser.help.HelpAndFeedback;
 import org.chromium.chrome.browser.native_page.NativePageNavigationDelegate;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.MockTab;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.xsurface.FeedActionsHandler;
+import org.chromium.chrome.browser.xsurface.ProcessScope;
 import org.chromium.chrome.test.util.browser.Features;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
 import org.chromium.components.feed.proto.FeedUiProto.Slice;
@@ -63,7 +67,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
-/** Unit tests for {@link FeedStreamSurface}. */
+/** Unit tests for {@link FeedStreamSeSurface}. */
 @RunWith(BaseRobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
 public class FeedStreamSurfaceTest {
@@ -105,6 +109,11 @@ public class FeedStreamSurfaceTest {
     @Mock
     private FeedStreamSurface.Natives mFeedStreamSurfaceJniMock;
 
+    @Mock
+    private AppHooksImpl mAppHooks;
+    @Mock
+    private ProcessScope mProcessScope;
+
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
@@ -116,6 +125,10 @@ public class FeedStreamSurfaceTest {
         when(mFeedServiceBridgeJniMock.getLoadMoreTriggerLookahead())
                 .thenReturn(LOAD_MORE_TRIGGER_LOOKAHEAD);
 
+        when(mAppHooks.getExternalSurfaceProcessScope(any())).thenReturn(mProcessScope);
+
+        AppHooks.setInstanceForTesting(mAppHooks);
+
         Profile.setLastUsedProfileForTesting(mProfileMock);
         mFeedStreamSurface = new FeedStreamSurface(mActivity, false, mSnackbarManager,
                 mPageNavigationDelegate, mBottomSheetController, mHelpAndFeedback);
@@ -126,6 +139,12 @@ public class FeedStreamSurfaceTest {
         mRecyclerView.setLayoutManager(mLayoutManager);
     }
 
+    @After
+    public void tearDown() {
+        FeedStreamSurface.shutdownForTesting();
+        AppHooks.setInstanceForTesting(null);
+    }
+
     @Test
     @SmallTest
     public void testAddSlicesOnStreamUpdated() {
@@ -453,10 +472,7 @@ public class FeedStreamSurfaceTest {
 
     @Test
     @SmallTest
-    public void testSurfaceClosed() {
-        FeedListContentManager mContentManager =
-                mFeedStreamSurface.getFeedListContentManagerForTesting();
-
+    public void testRemoveContentsOnSurfaceClosed() {
         // Set 2 header views first.
         View v0 = new View(mActivity);
         View v1 = new View(mActivity);
@@ -542,6 +558,42 @@ public class FeedStreamSurfaceTest {
                 .loadMore(anyLong(), any(FeedStreamSurface.class), any(Callback.class));
     }
 
+    @Test
+    @SmallTest
+    public void testSurfaceOpenedAndClosed() {
+        // Calling surfaceOpened() before startup() should not trigger native open call.
+        mFeedStreamSurface.surfaceOpened();
+        verify(mFeedStreamSurfaceJniMock, never())
+                .surfaceOpened(anyLong(), any(FeedStreamSurface.class));
+
+        // Calling surfaceClosed() before startup() should not trigger native open call.
+        mFeedStreamSurface.surfaceClosed();
+        verify(mFeedStreamSurfaceJniMock, never())
+                .surfaceClosed(anyLong(), any(FeedStreamSurface.class));
+
+        FeedStreamSurface.startup();
+
+        // Calling surfaceOpened() after startup() should trigger native open call.
+        mFeedStreamSurface.surfaceOpened();
+        verify(mFeedStreamSurfaceJniMock).surfaceOpened(anyLong(), any(FeedStreamSurface.class));
+
+        // Calling surfaceClosed() after startup() should trigger native open call.
+        mFeedStreamSurface.surfaceClosed();
+        verify(mFeedStreamSurfaceJniMock).surfaceClosed(anyLong(), any(FeedStreamSurface.class));
+    }
+
+    @Test
+    @SmallTest
+    public void testClearAll() {
+        FeedStreamSurface.startup();
+        mFeedStreamSurface.surfaceOpened();
+        verify(mFeedStreamSurfaceJniMock).surfaceOpened(anyLong(), any(FeedStreamSurface.class));
+
+        FeedStreamSurface.clearAll();
+        verify(mFeedStreamSurfaceJniMock).surfaceClosed(anyLong(), any(FeedStreamSurface.class));
+        verify(mProcessScope).resetAccount();
+    }
+
     private SliceUpdate createSliceUpdateForExistingSlice(String sliceId) {
         return SliceUpdate.newBuilder().setSliceId(sliceId).build();
     }

chrome/browser/android/feed/v2/feed_service_bridge.cc

@@ -56,6 +56,11 @@ DisplayMetrics FeedServiceBridge::GetDisplayMetrics() {
   return result;
 }
 
+void FeedServiceBridge::ClearAll() {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_FeedServiceBridge_clearAll(env);
+}
+
 bool FeedServiceBridge::IsEnabled() {
   Profile* profile = ProfileManager::GetLastUsedProfile();
   return FeedService::IsEnabled(*profile->GetPrefs());

chrome/browser/android/feed/v2/feed_service_bridge.h

@@ -16,6 +16,7 @@ class FeedServiceBridge {
  public:
   static std::string GetLanguageTag();
   static DisplayMetrics GetDisplayMetrics();
+  static void ClearAll();
   static bool IsEnabled();
 };
 

chrome/browser/android/feed/v2/feed_service_factory.cc

@@ -44,6 +44,7 @@ class FeedServiceDelegateImpl : public FeedService::Delegate {
   DisplayMetrics GetDisplayMetrics() override {
     return FeedServiceBridge::GetDisplayMetrics();
   }
+  void ClearAll() override { FeedServiceBridge::ClearAll(); }
 };
 
 }  // namespace

components/feed/core/v2/feed_stream.cc

@@ -536,6 +536,8 @@ void FeedStream::BackgroundRefreshComplete(LoadStreamTask::Result result) {
 }
 
 void FeedStream::ClearAll() {
+  delegate_->ClearAll();
+
   metrics_reporter_->OnClearAll(clock_->Now() - GetLastFetchTime());
 
   task_queue_.AddTask(std::make_unique<ClearAllTask>(this));

components/feed/core/v2/feed_stream.h

@@ -65,6 +65,7 @@ class FeedStream : public FeedStreamApi,
     virtual bool IsOffline() = 0;
     virtual DisplayMetrics GetDisplayMetrics() = 0;
     virtual std::string GetLanguageTag() = 0;
+    virtual void ClearAll() = 0;
   };
 
   // Forwards to |feed::TranslateWireResponse()| by default. Can be overridden

components/feed/core/v2/feed_stream_unittest.cc

@@ -539,6 +539,7 @@ class FeedStreamTest : public testing::Test, public FeedStream::Delegate {
     return result;
   }
   std::string GetLanguageTag() override { return "en-US"; }
+  void ClearAll() override {}
 
   // For tests.
 

components/feed/core/v2/public/feed_service.cc

@@ -116,6 +116,7 @@ class FeedService::StreamDelegateImpl : public FeedStream::Delegate {
   std::string GetLanguageTag() override {
     return service_delegate_->GetLanguageTag();
   }
+  void ClearAll() override { service_delegate_->ClearAll(); }
 
  private:
   FeedService::Delegate* service_delegate_;

components/feed/core/v2/public/feed_service.h

@@ -63,6 +63,8 @@ class FeedService : public KeyedService {
     virtual std::string GetLanguageTag() = 0;
     // Returns display metrics for the device.
     virtual DisplayMetrics GetDisplayMetrics() = 0;
+    // Clear all stored data.
+    virtual void ClearAll() = 0;
   };
 
   // Construct a FeedService given an already constructed FeedStream.