Change CBD layout and texts

components/browsing_data/core/browsing_data_utils_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 "components/browsing_data/core/browsing_data_utils.h"
 
 #include <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
@@ skipping 65 matching lines @@
     browsing_data::AutofillCounter::AutofillResult result(
         &counter, test_case.num_suggestions, test_case.num_credit_cards,
         test_case.num_addresses);
 
     SCOPED_TRACE(
         base::StringPrintf("Test params: %d credit card(s), "
                            "%d address(es), %d suggestion(s).",
                            test_case.num_credit_cards, test_case.num_addresses,
                            test_case.num_suggestions));
 
-    base::string16 output = browsing_data::GetCounterTextFromResult(&result);
+    base::string16 output = browsing_data::GetCounterTextFromResult(
+        &result, browsing_data::ClearBrowsingDataTab::ADVANCED);
     EXPECT_EQ(output, base::ASCIIToUTF16(test_case.expected_output));
   }
 }
 
 TEST_F(BrowsingDataUtilsTest, MigratePreferencesToBasic) {
   using namespace browsing_data::prefs;
 
   prefs()->SetBoolean(kDeleteBrowsingHistory, true);
   prefs()->SetBoolean(kDeleteCookies, false);
   prefs()->SetBoolean(kDeleteCache, false);
@@ skipping 12 matching lines @@
   prefs()->SetInteger(kDeleteTimePeriod, 100);
 
   // After the first migration all settings should stay the same if the
   // migration is executed again.
   browsing_data::MigratePreferencesToBasic(prefs());
   EXPECT_TRUE(prefs()->GetBoolean(kDeleteBrowsingHistoryBasic));
   EXPECT_FALSE(prefs()->GetBoolean(kDeleteCookiesBasic));
   EXPECT_FALSE(prefs()->GetBoolean(kDeleteCacheBasic));
   EXPECT_EQ(42, prefs()->GetInteger(kDeleteTimePeriodBasic));
 }