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

chrome/browser/android/preferences/important_sites_util_unittest.cc

Index: chrome/browser/android/preferences/important_sites_util_unittest.cc
diff --git a/chrome/browser/android/preferences/important_sites_util_unittest.cc b/chrome/browser/android/preferences/important_sites_util_unittest.cc
index f2be975fceb199f80dfb6d13c5946e7ea1022244..3504158cbd35b6135d28a2d8f7b4de2596df1b91 100644
--- a/chrome/browser/android/preferences/important_sites_util_unittest.cc
+++ b/chrome/browser/android/preferences/important_sites_util_unittest.cc
@@ -71,7 +71,7 @@ class ImportantSitesUtilTest : public ChromeRenderViewHostTestHarness {
 
 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());
 }
 
@@ -101,9 +101,13 @@ TEST_F(ImportantSitesUtilTest, NotificationsThenEngagement) {
   // 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,