[Storage] Android - ManageSpace UI, Important Origins, and CBD Dialog

chrome/browser/android/preferences/important_sites_util_unittest.cc

 // 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.
 
 #include "chrome/browser/android/preferences/important_sites_util.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/files/scoped_temp_dir.h"
@@ skipping 53 matching lines @@
             CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
             content_settings::ResourceIdentifier(), setting);
   }
 
  private:
   base::ScopedTempDir temp_dir_;
 };
 
 TEST_F(ImportantSitesUtilTest, TestNoImportantSites) {
   EXPECT_TRUE(ImportantSitesUtil::GetImportantRegisterableDomains(
-                  profile(), kNumImportantSites)
+                  profile(), kNumImportantSites, nullptr)

[Theresa, 2016/05/26 18:08:45]

Will you please add a simple test where there are important sites but favicons
aren't requested to future-proof passing a nullptr?

[dmurph, 2016/05/27 02:09:12]

Done.

                   .empty());
 }
 
 TEST_F(ImportantSitesUtilTest, NotificationsThenEngagement) {
   SiteEngagementService* service = SiteEngagementService::Get(profile());
   ASSERT_TRUE(service);
 
   GURL url1("http://www.google.com/");
   GURL url2("https://www.google.com/");
   GURL url3("https://drive.google.com/");
   GURL url4("https://www.chrome.com/");
   GURL url5("https://www.example.com/");
   GURL url6("https://youtube.com/");
   GURL url7("https://foo.bar/");
 
   service->ResetScoreForURL(url1, 5);
   service->ResetScoreForURL(url2, 2);  // Below medium engagement (5).
   service->ResetScoreForURL(url3, 7);
   service->ResetScoreForURL(url4, 8);
   service->ResetScoreForURL(url5, 9);
   service->ResetScoreForURL(url6, 1);  // Below the medium engagement (5).
   service->ResetScoreForURL(url7, 11);
 
   // Here we should have:
   // 1: removed domains below minimum engagement,
   // 2: combined the google.com entries, and
   // 3: sorted by the score.
   std::vector<std::string> expected_sorted_domains = {
       "foo.bar", "example.com", "chrome.com", "google.com"};
+  std::vector<GURL> example_origins;
   EXPECT_THAT(ImportantSitesUtil::GetImportantRegisterableDomains(
-                  profile(), kNumImportantSites),
+                  profile(), kNumImportantSites, &example_origins),
               ::testing::ElementsAreArray(expected_sorted_domains));
+  std::vector<GURL> expected_sorted_origins = {url7, url5, url4, url1};
+  EXPECT_THAT(example_origins,
+              ::testing::ElementsAreArray(expected_sorted_origins));
 
   // Test that notifications get moved to the front.
   AddContentSetting(CONTENT_SETTINGS_TYPE_NOTIFICATIONS, CONTENT_SETTING_ALLOW,
                     url6);
   // BLOCK'ed sites don't count. We want to make sure we only bump sites that
   // were granted the permsion.
   AddContentSetting(CONTENT_SETTINGS_TYPE_NOTIFICATIONS, CONTENT_SETTING_BLOCK,
                     url1);
 
   // Same as above, but the site with notifications should be at the front.
   expected_sorted_domains = {"youtube.com", "foo.bar", "example.com",
                              "chrome.com", "google.com"};
   EXPECT_THAT(ImportantSitesUtil::GetImportantRegisterableDomains(
                   profile(), kNumImportantSites),
               ::testing::ElementsAreArray(expected_sorted_domains));
 }