[subresource_filter] Implement the "Smart" UI on Android

chrome/browser/subresource_filter/chrome_subresource_filter_client.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SUBRESOURCE_FILTER_CHROME_SUBRESOURCE_FILTER_CLIENT_H_
 #define CHROME_BROWSER_SUBRESOURCE_FILTER_CHROME_SUBRESOURCE_FILTER_CLIENT_H_
 
+#include <memory>
+
 #include "base/macros.h"
+#include "base/time/clock.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/subresource_filter/content/browser/subresource_filter_client.h"
 
 class GURL;
+class HostContentSettingsMap;
 
 namespace content {
 class WebContents;
 }  // namespace content
 
 // This enum backs a histogram. Make sure new elements are only added to the
 // end. Keep histograms.xml up to date with any changes.
 enum SubresourceFilterAction {
   // Main frame navigation to a different document.
   kActionNavigationStarted = 0,
@@ skipping 22 matching lines @@
   kActionContentSettingsBlockedGlobal,
 
   // A wildcard update. The current content settings API makes this a bit
   // difficult to see whether it is Block or Allow. This should not be a huge
   // problem because this can only be changed from the settings UI, which is
   // relatively rare.
   // TODO(crbug.com/706061): Fix this once content settings API becomes more
   // flexible.
   kActionContentSettingsWildcardUpdate,
 
+  // The UI was suppressed due to "smart" logic which tries not to spam the UI
+  // on navigations within a certain time period.
+  kActionUISuppressed,
+
   kActionLastEntry
 };
 
 // Chrome implementation of SubresourceFilterClient.
 class ChromeSubresourceFilterClient
     : public subresource_filter::SubresourceFilterClient {
  public:
   explicit ChromeSubresourceFilterClient(content::WebContents* web_contents);
   ~ChromeSubresourceFilterClient() override;
 
   // SubresourceFilterClient:
-  void ToggleNotificationVisibility(bool visibility) override;
+  void ToggleNotificationVisibility(const GURL& url, bool visibility) override;
   bool IsWhitelistedByContentSettings(const GURL& url) override;
   void WhitelistByContentSettings(const GURL& url) override;
 
   static void LogAction(SubresourceFilterAction action);
 
+  bool UsingSmartUI() const;
+
+  void set_clock_for_testing(std::unique_ptr<base::Clock> tick_clock) {

[engedy, 2017/04/04 13:36:00]

nit: Have you considered supplying this in the ctor instead?

[Charlie Harrison, 2017/04/10 14:58:53]

Yeah, but it isn't ideal, because we want to reset it in browser tests, which
don't get to construct their own client.

[engedy, 2017/04/12 14:02:50]

Acknowledged.

+    clock_ = std::move(tick_clock);
+  }
+
+  bool shown_for_navigation() const { return shown_for_navigation_; }
+
  private:
-  ContentSetting GetContentSettingForUrl(const GURL& url);
+  // Android specific logic for more intelligent UI.
+  void OnUIShown(const GURL& url);

[engedy, 2017/04/04 13:36:00]

nit: How about OnDidShowUI?

[Charlie Harrison, 2017/04/10 14:58:53]

Done.

+  bool ShouldShowUIForSite(const GURL& url) const;
+
+  HostContentSettingsMap* GetSettingsMap() const;
+
+  // For testing.

[engedy, 2017/04/04 13:35:59]

nit: I find this comment a bit misleading, as this clock is always used, it is
only that it can be mocked out for testing.

[Charlie Harrison, 2017/04/10 14:58:53]

Updated the comment.

+  std::unique_ptr<base::Clock> clock_;
+
   content::WebContents* web_contents_;
   bool shown_for_navigation_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeSubresourceFilterClient);
 };
 
 #endif  // CHROME_BROWSER_SUBRESOURCE_FILTER_CHROME_SUBRESOURCE_FILTER_CLIENT_H_