[Durable] Updated Durable heuristic to use 'important sites'

chrome/browser/storage/durable_storage_permission_context_unittest.cc

Index: chrome/browser/storage/durable_storage_permission_context_unittest.cc
diff --git a/chrome/browser/storage/durable_storage_permission_context_unittest.cc b/chrome/browser/storage/durable_storage_permission_context_unittest.cc
index 08a169ba3f859d9f32b454efe17af6bff5fe2285..0f8487f4f227f14e91bf005e5d9668775893313b 100644
--- a/chrome/browser/storage/durable_storage_permission_context_unittest.cc
+++ b/chrome/browser/storage/durable_storage_permission_context_unittest.cc
@@ -10,6 +10,8 @@
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/engagement/important_sites_util.h"
+#include "chrome/browser/engagement/site_engagement_score.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/browser/permissions/permission_request_manager.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
@@ -74,74 +76,24 @@ class TestDurablePermissionContext : public DurableStoragePermissionContext {
 
 }  // namespace
 
-class BookmarksOriginTest : public ::testing::Test {
- protected:
-  static std::vector<BookmarkModel::URLAndTitle> MakeBookmarks(
-      const std::string urls[],
-      const int array_size) {
-    std::vector<BookmarkModel::URLAndTitle> bookmarks;
-    for (int i = 0; i < array_size; ++i) {
-      BookmarkModel::URLAndTitle bookmark;
-      bookmark.url = GURL(urls[i]);
-      EXPECT_TRUE(bookmark.url.is_valid());
-      bookmarks.push_back(bookmark);
-    }
-    return bookmarks;
-  }
-};
-
-TEST_F(BookmarksOriginTest, Exists) {
-  std::string urls[] = {
-    "http://www.google.com/",
-    "https://dogs.com/somepage.html",
-    "https://mail.google.com/mail/u/0/#inbox",
-  };
-  std::vector<BookmarkModel::URLAndTitle> bookmarks =
-      MakeBookmarks(urls, arraysize(urls));
-  GURL looking_for("https://dogs.com");
-  EXPECT_TRUE(DurableStoragePermissionContext::IsOriginBookmarked(
-      bookmarks, looking_for));
-}
-
-TEST_F(BookmarksOriginTest, DoesntExist) {
-  std::string urls[] = {
-    "http://www.google.com/",
-    "https://www.google.com/",
-  };
-  std::vector<BookmarkModel::URLAndTitle> bookmarks =
-      MakeBookmarks(urls, arraysize(urls));
-  GURL looking_for("https://dogs.com");
-  EXPECT_FALSE(DurableStoragePermissionContext::IsOriginBookmarked(
-      bookmarks, looking_for));
-}
 
 class DurableStoragePermissionContextTest
     : public ChromeRenderViewHostTestHarness {
  protected:
   void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
-    HostContentSettingsMapFactory::GetForProfile(profile())
-        ->ClearSettingsForOneType(CONTENT_SETTINGS_TYPE_DURABLE_STORAGE);
+    SiteEngagementScore::SetParamValuesForTesting();

[michaeln, 2016/10/05 23:27:45]

would it work/makesense to put this call inside of MakeOriginImportant() since
this is needed for that? the dependency between this and that, and the need for
this call, is not obvious

[dmurph, 2016/10/06 01:02:00]

Done.

   }
 
-  void AddBookmark(const GURL& origin) {
-    if (!model_) {
-      profile()->CreateBookmarkModel(true);
-      model_ = BookmarkModelFactory::GetForBrowserContext(profile());
-      bookmarks::test::WaitForBookmarkModelToLoad(model_);
-    }
-
-    model_->AddURL(model_->bookmark_bar_node(), 0,
-                   base::ASCIIToUTF16(origin.spec()), origin);
+  void MakeOriginImportant(const GURL& origin) {
+    ImportantSitesUtil::MarkOriginAsImportantForTesting(profile(), origin);
   }
-
-  BookmarkModel* model_ = nullptr;
 };
 
 TEST_F(DurableStoragePermissionContextTest, Bookmarked) {
   TestDurablePermissionContext permission_context(profile());
   GURL url("https://www.google.com");
-  AddBookmark(url);
+  MakeOriginImportant(url);
   NavigateAndCommit(url);
 
   const PermissionRequestID id(web_contents()->GetRenderProcessHost()->GetID(),
@@ -167,7 +119,7 @@ TEST_F(DurableStoragePermissionContextTest, BookmarkAndIncognitoMode) {
   TestDurablePermissionContext permission_context(
       profile()->GetOffTheRecordProfile());
   GURL url("https://www.google.com");
-  AddBookmark(url);
+  MakeOriginImportant(url);
   NavigateAndCommit(url);
 
   const PermissionRequestID id(web_contents()->GetRenderProcessHost()->GetID(),
@@ -217,7 +169,7 @@ TEST_F(DurableStoragePermissionContextTest, NoBookmark) {
 TEST_F(DurableStoragePermissionContextTest, CookiesNotAllowed) {
   TestDurablePermissionContext permission_context(profile());
   GURL url("https://www.google.com");
-  AddBookmark(url);
+  MakeOriginImportant(url);
   NavigateAndCommit(url);
 
   scoped_refptr<content_settings::CookieSettings> cookie_settings =
@@ -248,7 +200,7 @@ TEST_F(DurableStoragePermissionContextTest, EmbeddedFrame) {
   TestDurablePermissionContext permission_context(profile());
   GURL url("https://www.google.com");
   GURL requesting_url("https://www.youtube.com");
-  AddBookmark(url);
+  MakeOriginImportant(url);
   NavigateAndCommit(url);
 
   const PermissionRequestID id(web_contents()->GetRenderProcessHost()->GetID(),