Refactor to share code between shortcuts tests.

components/omnibox/browser/shortcuts_provider_unittest.cc

 // Copyright (c) 2012 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/omnibox/browser/shortcuts_provider.h"
 
 #include <math.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ skipping 14 matching lines @@
 #include "components/history/core/browser/url_database.h"
 #include "components/history/core/test/history_service_test_util.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_provider.h"
 #include "components/omnibox/browser/autocomplete_result.h"
 #include "components/omnibox/browser/in_memory_url_index.h"
 #include "components/omnibox/browser/mock_autocomplete_provider_client.h"
 #include "components/omnibox/browser/shortcuts_backend.h"
+#include "components/omnibox/browser/shortcuts_provider_test_util.h"
 #include "components/omnibox/browser/test_scheme_classifier.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ASCIIToUTF16;
 
 // TestShortcutInfo -----------------------------------------------------------
 
 namespace {
 
-struct TestShortcutInfo {
-  std::string guid;
-  std::string text;
-  std::string fill_into_edit;
-  std::string destination_url;
-  std::string contents;
-  std::string contents_class;
-  std::string description;
-  std::string description_class;
-  ui::PageTransition transition;
-  AutocompleteMatch::Type type;
-  std::string keyword;
-  int days_from_now;
-  int number_of_hits;
-} shortcut_test_db[] = {
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880E0", "goog", "www.google.com",
-    "http://www.google.com/", "Google", "0,1,4,0", "Google", "0,3,4,1",
-    ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1,
-    100 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880E1", "slash", "slashdot.org",
-    "http://slashdot.org/", "slashdot.org", "0,3,5,1",
-    "Slashdot - News for nerds, stuff that matters", "0,2,5,0",
-    ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 0,
-    100 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880E2", "news", "slashdot.org",
-    "http://slashdot.org/", "slashdot.org", "0,1",
-    "Slashdot - News for nerds, stuff that matters", "0,0,11,2,15,0",
-    ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 0,
-    5 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880E3", "news", "sports.yahoo.com",
-    "http://sports.yahoo.com/", "sports.yahoo.com", "0,1",
-    "Yahoo! Sports - Sports News, Scores, Rumors, Fantasy Games, and more",
-    "0,0,23,2,27,0", ui::PAGE_TRANSITION_TYPED,
-    AutocompleteMatchType::HISTORY_TITLE, "", 2, 5 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880E4", "news weather",
-    "www.cnn.com/index.html", "http://www.cnn.com/index.html",
-    "www.cnn.com/index.html", "0,1",
-    "CNN.com - Breaking News, U.S., World, Weather, Entertainment & Video",
-    "0,0,19,2,23,0,38,2,45,0", ui::PAGE_TRANSITION_TYPED,
-    AutocompleteMatchType::HISTORY_TITLE, "", 1, 10 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880E5", "nhl scores", "sports.yahoo.com",
-    "http://sports.yahoo.com/", "sports.yahoo.com", "0,1",
-    "Yahoo! Sports - Sports News, Scores, Rumors, Fantasy Games, and more",
-    "0,0,29,2,35,0", ui::PAGE_TRANSITION_TYPED,
-    AutocompleteMatchType::HISTORY_BODY, "", 1, 10 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880E6", "nhl scores",
-    "www.nhl.com/scores/index.html", "http://www.nhl.com/scores/index.html",
-    "www.nhl.com/scores/index.html", "0,1,4,3,7,1",
-    "January 13, 2010 - NHL.com - Scores", "0,0,19,2,22,0,29,2,35,0",
-    ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 5,
-    1 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880E7", "just", "www.testsite.com/a.html",
-    "http://www.testsite.com/a.html", "www.testsite.com/a.html", "0,1",
-    "Test - site - just a test", "0,0,14,2,18,0",
-    ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 5,
-    1 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880E8", "just", "www.testsite.com/b.html",
-    "http://www.testsite.com/b.html", "www.testsite.com/b.html", "0,1",
-    "Test - site - just a test", "0,0,14,2,18,0",
-    ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 5,
-    2 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880E9", "just", "www.testsite.com/c.html",
-    "http://www.testsite.com/c.html", "www.testsite.com/c.html", "0,1",
-    "Test - site - just a test", "0,0,14,2,18,0",
-    ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 8,
-    1 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880EA", "just a", "www.testsite.com/d.html",
-    "http://www.testsite.com/d.html", "www.testsite.com/d.html", "0,1",
-    "Test - site - just a test", "0,0,14,2,18,0",
-    ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "",
-    12, 1 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880EB", "just a t",
-    "www.testsite.com/e.html", "http://www.testsite.com/e.html",
-    "www.testsite.com/e.html", "0,1", "Test - site - just a test",
-    "0,0,14,2,18,0", ui::PAGE_TRANSITION_TYPED,
-    AutocompleteMatchType::HISTORY_TITLE, "", 12, 1 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880EC", "just a te",
-    "www.testsite.com/f.html", "http://www.testsite.com/f.html",
-    "www.testsite.com/f.html", "0,1", "Test - site - just a test",
-    "0,0,14,2,18,0", ui::PAGE_TRANSITION_TYPED,
-    AutocompleteMatchType::HISTORY_TITLE, "", 12, 1 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880ED", "ago", "www.daysagotest.com/a.html",
-    "http://www.daysagotest.com/a.html", "www.daysagotest.com/a.html",
-    "0,1,8,3,11,1", "Test - site", "0,0", ui::PAGE_TRANSITION_TYPED,
-    AutocompleteMatchType::HISTORY_URL, "", 1, 1 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880EE", "ago", "www.daysagotest.com/b.html",
-    "http://www.daysagotest.com/b.html", "www.daysagotest.com/b.html",
-    "0,1,8,3,11,1", "Test - site", "0,0", ui::PAGE_TRANSITION_TYPED,
-    AutocompleteMatchType::HISTORY_URL, "", 2, 1 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880EF", "ago", "www.daysagotest.com/c.html",
-    "http://www.daysagotest.com/c.html", "www.daysagotest.com/c.html",
-    "0,1,8,3,11,1", "Test - site", "0,0", ui::PAGE_TRANSITION_TYPED,
-    AutocompleteMatchType::HISTORY_URL, "", 3, 1 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880F0", "ago", "www.daysagotest.com/d.html",
-    "http://www.daysagotest.com/d.html", "www.daysagotest.com/d.html",
-    "0,1,8,3,11,1", "Test - site", "0,0", ui::PAGE_TRANSITION_TYPED,
-    AutocompleteMatchType::HISTORY_URL, "", 4, 1 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880F2", "abcdef.com", "http://abcdef.com",
-    "http://abcdef.com/", "Abcdef", "0,1,4,0", "Abcdef", "0,3,4,1",
-    ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1,
-    100 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880F3", "query", "query",
-    "https://www.google.com/search?q=query", "query", "0,0",
-    "Google Search", "0,4", ui::PAGE_TRANSITION_GENERATED,
-    AutocompleteMatchType::SEARCH_HISTORY, "", 1, 100 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880F4", "word", "www.word",
-    "https://www.google.com/search?q=www.word", "www.word", "0,0",
-    "Google Search", "0,4", ui::PAGE_TRANSITION_GENERATED,
-    AutocompleteMatchType::SEARCH_HISTORY, "", 1, 100 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880F5", "about:o", "chrome://omnibox",
-    "chrome://omnibox/", "about:omnibox", "0,3,10,1", "", "",
-    ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::NAVSUGGEST, "",
-    1, 100 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880F6", "www/real sp",
-    "http://www/real space/long-url-with-space.html",
-    "http://www/real%20space/long-url-with-space.html",
-    "www/real space/long-url-with-space.html", "0,3,11,1",
-    "Page With Space; Input with Space", "0,0",
-    ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "",
-    1, 100 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880F7", "duplicate", "http://duplicate.com",
-    "http://duplicate.com/", "Duplicate", "0,1", "Duplicate", "0,1",
-    ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1,
-    100 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880F8", "dupl", "http://duplicate.com",
-    "http://duplicate.com/", "Duplicate", "0,1", "Duplicate", "0,1",
-    ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1,
-    100 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880F9", "notrailing.com/",
-    "http://notrailing.com", "http://notrailing.com/", "No Trailing Slash",
-    "0,1", "No Trailing Slash on fill_into_edit", "0,1",
-    ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "",
-    1, 100 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880FA", "http:///foo.com",
-    "http://foo.com", "http://foo.com/", "Foo - Typo in Input",
-    "0,1", "Foo - Typo in Input Corrected in fill_into_edit", "0,1",
-    ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "",
-    1, 100 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880FB", "trailing1 ",
-    "http://trailing1.com", "http://trailing1.com/",
-    "Trailing1 - Space in Shortcut", "0,1",
-    "Trailing1 - Space in Shortcut", "0,1", ui::PAGE_TRANSITION_TYPED,
-    AutocompleteMatchType::HISTORY_URL, "", 1, 100 },
-  { "BD85DBA2-8C29-49F9-84AE-48E1E90880FC", "about:trailing2 ",
-    "chrome://trailing2blah", "chrome://trailing2blah/",
-    "Trailing2 - Space in Shortcut", "0,1",
-    "Trailing2 - Space in Shortcut", "0,1", ui::PAGE_TRANSITION_TYPED,
-    AutocompleteMatchType::HISTORY_URL, "", 1, 100 },
+struct TestShortcutInfo shortcut_test_db[] = {
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880E0", "goog", "www.google.com",
+     "http://www.google.com/", "Google", "0,1,4,0", "Google", "0,3,4,1",
+     ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, 100},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880E1", "slash", "slashdot.org",
+     "http://slashdot.org/", "slashdot.org", "0,3,5,1",
+     "Slashdot - News for nerds, stuff that matters", "0,2,5,0",
+     ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 0, 100},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880E2", "news", "slashdot.org",
+     "http://slashdot.org/", "slashdot.org", "0,1",
+     "Slashdot - News for nerds, stuff that matters", "0,0,11,2,15,0",
+     ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_TITLE, "", 0, 5},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880E3", "news", "sports.yahoo.com",
+     "http://sports.yahoo.com/", "sports.yahoo.com", "0,1",
+     "Yahoo! Sports - Sports News, Scores, Rumors, Fantasy Games, and more",
+     "0,0,23,2,27,0", ui::PAGE_TRANSITION_TYPED,
+     AutocompleteMatchType::HISTORY_TITLE, "", 2, 5},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880E4", "news weather",
+     "www.cnn.com/index.html", "http://www.cnn.com/index.html",
+     "www.cnn.com/index.html", "0,1",
+     "CNN.com - Breaking News, U.S., World, Weather, Entertainment & Video",
+     "0,0,19,2,23,0,38,2,45,0", ui::PAGE_TRANSITION_TYPED,
+     AutocompleteMatchType::HISTORY_TITLE, "", 1, 10},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880E5", "nhl scores", "sports.yahoo.com",
+     "http://sports.yahoo.com/", "sports.yahoo.com", "0,1",
+     "Yahoo! Sports - Sports News, Scores, Rumors, Fantasy Games, and more",
+     "0,0,29,2,35,0", ui::PAGE_TRANSITION_TYPED,
+     AutocompleteMatchType::HISTORY_BODY, "", 1, 10},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880E6", "nhl scores",
+     "www.nhl.com/scores/index.html", "http://www.nhl.com/scores/index.html",
+     "www.nhl.com/scores/index.html", "0,1,4,3,7,1",
+     "January 13, 2010 - NHL.com - Scores", "0,0,19,2,22,0,29,2,35,0",
+     ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 5, 1},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880E7", "just", "www.testsite.com/a.html",
+     "http://www.testsite.com/a.html", "www.testsite.com/a.html", "0,1",
+     "Test - site - just a test", "0,0,14,2,18,0", ui::PAGE_TRANSITION_TYPED,
+     AutocompleteMatchType::HISTORY_TITLE, "", 5, 1},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880E8", "just", "www.testsite.com/b.html",
+     "http://www.testsite.com/b.html", "www.testsite.com/b.html", "0,1",
+     "Test - site - just a test", "0,0,14,2,18,0", ui::PAGE_TRANSITION_TYPED,
+     AutocompleteMatchType::HISTORY_TITLE, "", 5, 2},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880E9", "just", "www.testsite.com/c.html",
+     "http://www.testsite.com/c.html", "www.testsite.com/c.html", "0,1",
+     "Test - site - just a test", "0,0,14,2,18,0", ui::PAGE_TRANSITION_TYPED,
+     AutocompleteMatchType::HISTORY_TITLE, "", 8, 1},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880EA", "just a",
+     "www.testsite.com/d.html", "http://www.testsite.com/d.html",
+     "www.testsite.com/d.html", "0,1", "Test - site - just a test",
+     "0,0,14,2,18,0", ui::PAGE_TRANSITION_TYPED,
+     AutocompleteMatchType::HISTORY_TITLE, "", 12, 1},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880EB", "just a t",
+     "www.testsite.com/e.html", "http://www.testsite.com/e.html",
+     "www.testsite.com/e.html", "0,1", "Test - site - just a test",
+     "0,0,14,2,18,0", ui::PAGE_TRANSITION_TYPED,
+     AutocompleteMatchType::HISTORY_TITLE, "", 12, 1},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880EC", "just a te",
+     "www.testsite.com/f.html", "http://www.testsite.com/f.html",
+     "www.testsite.com/f.html", "0,1", "Test - site - just a test",
+     "0,0,14,2,18,0", ui::PAGE_TRANSITION_TYPED,
+     AutocompleteMatchType::HISTORY_TITLE, "", 12, 1},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880ED", "ago",
+     "www.daysagotest.com/a.html", "http://www.daysagotest.com/a.html",
+     "www.daysagotest.com/a.html", "0,1,8,3,11,1", "Test - site", "0,0",
+     ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, 1},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880EE", "ago",
+     "www.daysagotest.com/b.html", "http://www.daysagotest.com/b.html",
+     "www.daysagotest.com/b.html", "0,1,8,3,11,1", "Test - site", "0,0",
+     ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 2, 1},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880EF", "ago",
+     "www.daysagotest.com/c.html", "http://www.daysagotest.com/c.html",
+     "www.daysagotest.com/c.html", "0,1,8,3,11,1", "Test - site", "0,0",
+     ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 3, 1},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880F0", "ago",
+     "www.daysagotest.com/d.html", "http://www.daysagotest.com/d.html",
+     "www.daysagotest.com/d.html", "0,1,8,3,11,1", "Test - site", "0,0",
+     ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 4, 1},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880F2", "abcdef.com", "http://abcdef.com",
+     "http://abcdef.com/", "Abcdef", "0,1,4,0", "Abcdef", "0,3,4,1",
+     ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, 100},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880F3", "query", "query",
+     "https://www.google.com/search?q=query", "query", "0,0", "Google Search",
+     "0,4", ui::PAGE_TRANSITION_GENERATED,
+     AutocompleteMatchType::SEARCH_HISTORY, "", 1, 100},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880F4", "word", "www.word",
+     "https://www.google.com/search?q=www.word", "www.word", "0,0",
+     "Google Search", "0,4", ui::PAGE_TRANSITION_GENERATED,
+     AutocompleteMatchType::SEARCH_HISTORY, "", 1, 100},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880F5", "about:o", "chrome://omnibox",
+     "chrome://omnibox/", "about:omnibox", "0,3,10,1", "", "",
+     ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::NAVSUGGEST, "", 1, 100},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880F6", "www/real sp",
+     "http://www/real space/long-url-with-space.html",
+     "http://www/real%20space/long-url-with-space.html",
+     "www/real space/long-url-with-space.html", "0,3,11,1",
+     "Page With Space; Input with Space", "0,0", ui::PAGE_TRANSITION_TYPED,
+     AutocompleteMatchType::HISTORY_URL, "", 1, 100},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880F7", "duplicate",
+     "http://duplicate.com", "http://duplicate.com/", "Duplicate", "0,1",
+     "Duplicate", "0,1", ui::PAGE_TRANSITION_TYPED,
+     AutocompleteMatchType::HISTORY_URL, "", 1, 100},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880F8", "dupl", "http://duplicate.com",
+     "http://duplicate.com/", "Duplicate", "0,1", "Duplicate", "0,1",
+     ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, 100},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880F9", "notrailing.com/",
+     "http://notrailing.com", "http://notrailing.com/", "No Trailing Slash",
+     "0,1", "No Trailing Slash on fill_into_edit", "0,1",
+     ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, 100},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880FA", "http:///foo.com",
+     "http://foo.com", "http://foo.com/", "Foo - Typo in Input", "0,1",
+     "Foo - Typo in Input Corrected in fill_into_edit", "0,1",
+     ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "", 1, 100},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880FB", "trailing1 ",
+     "http://trailing1.com", "http://trailing1.com/",
+     "Trailing1 - Space in Shortcut", "0,1", "Trailing1 - Space in Shortcut",
+     "0,1", ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "",
+     1, 100},
+    {"BD85DBA2-8C29-49F9-84AE-48E1E90880FC", "about:trailing2 ",
+     "chrome://trailing2blah", "chrome://trailing2blah/",
+     "Trailing2 - Space in Shortcut", "0,1", "Trailing2 - Space in Shortcut",
+     "0,1", ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::HISTORY_URL, "",
+     1, 100},
 };
 
 class FakeAutocompleteProviderClient
     : public testing::NiceMock<MockAutocompleteProviderClient> {
  public:
   FakeAutocompleteProviderClient()
       : db_thread_("Test DB thread"),
         pool_owner_(3, "Background Pool") {
     set_template_url_service(
         make_scoped_ptr(new TemplateURLService(nullptr, 0)));
@@ skipping 68 matching lines @@
       ShortcutsProvider::CreateWordMapForString(find_text), text_, matches_);
 }
 
 // ShortcutsProviderTest ------------------------------------------------------
 
 class ShortcutsProviderTest : public testing::Test {
  public:
   ShortcutsProviderTest();
 
  protected:
-  typedef std::pair<std::string, bool> ExpectedURLAndAllowedToBeDefault;
-  typedef std::vector<ExpectedURLAndAllowedToBeDefault> ExpectedURLs;
-
-  class SetShouldContain
-      : public std::unary_function<const ExpectedURLAndAllowedToBeDefault&,
-                                   std::set<std::string> > {
-   public:
-    explicit SetShouldContain(const ACMatches& matched_urls);
-
-    void operator()(const ExpectedURLAndAllowedToBeDefault& expected);
-    std::set<ExpectedURLAndAllowedToBeDefault> Leftovers() const {
-      return matches_;
-    }
-
-   private:
-    std::set<ExpectedURLAndAllowedToBeDefault> matches_;
-  };
-
   void SetUp() override;
   void TearDown() override;
 
-  // Fills test data into the provider.
-  void FillData(TestShortcutInfo* db, size_t db_size);
-
-  // Runs an autocomplete query on |text| with the provided
-  // |prevent_inline_autocomplete| setting and checks to see that the returned
-  // results' destination URLs match those provided. |expected_urls| does not
-  // need to be in sorted order, but |expected_top_result| should be the top
-  // match, and it should have inline autocompletion
-  // |top_result_inline_autocompletion|.
-  void RunTest(const base::string16 text,
-               bool prevent_inline_autocomplete,
-               const ExpectedURLs& expected_urls,
-               std::string expected_top_result,
-               base::string16 top_result_inline_autocompletion);
-
   // Passthrough to the private function in provider_.
   int CalculateScore(const std::string& terms,
                      const ShortcutsDatabase::Shortcut& shortcut,
                      int max_relevance);
 
   base::MessageLoop message_loop_;
   scoped_ptr<FakeAutocompleteProviderClient> client_;
   scoped_refptr<ShortcutsProvider> provider_;
-
-  ACMatches ac_matches_;  // The resulting matches after running RunTest.
 };
 
 ShortcutsProviderTest::ShortcutsProviderTest() {
 }
 
 void ShortcutsProviderTest::SetUp() {
   client_.reset(new FakeAutocompleteProviderClient());
 
   ASSERT_TRUE(client_->GetShortcutsBackend());
   provider_ = new ShortcutsProvider(client_.get());
-  FillData(shortcut_test_db, arraysize(shortcut_test_db));
+  PopulateShortcutsBackendWithTestShortcutData(client_->GetShortcutsBackend(),
+                                               shortcut_test_db,
+                                               arraysize(shortcut_test_db));
 }
 
 void ShortcutsProviderTest::TearDown() {
   // Run all pending tasks or else some threads hold on to the message loop
   // and prevent it from being deleted.
   message_loop_.RunUntilIdle();
   provider_ = NULL;
 }
 
-void ShortcutsProviderTest::FillData(TestShortcutInfo* db, size_t db_size) {
-  DCHECK(provider_.get());
-  scoped_refptr<ShortcutsBackend> backend = client_->GetShortcutsBackend();
-  size_t expected_size = backend->shortcuts_map().size() + db_size;
-  for (size_t i = 0; i < db_size; ++i) {
-    const TestShortcutInfo& cur = db[i];
-    ShortcutsDatabase::Shortcut shortcut(
-        cur.guid, ASCIIToUTF16(cur.text),
-        ShortcutsDatabase::Shortcut::MatchCore(
-            ASCIIToUTF16(cur.fill_into_edit), GURL(cur.destination_url),
-            ASCIIToUTF16(cur.contents), cur.contents_class,
-            ASCIIToUTF16(cur.description), cur.description_class,
-            cur.transition, cur.type, ASCIIToUTF16(cur.keyword)),
-        base::Time::Now() - base::TimeDelta::FromDays(cur.days_from_now),
-        cur.number_of_hits);
-    backend->AddShortcut(shortcut);
-  }
-  EXPECT_EQ(expected_size, backend->shortcuts_map().size());
-}
-
-ShortcutsProviderTest::SetShouldContain::SetShouldContain(
-    const ACMatches& matched_urls) {
-  for (ACMatches::const_iterator iter = matched_urls.begin();
-       iter != matched_urls.end(); ++iter)
-    matches_.insert(ExpectedURLAndAllowedToBeDefault(
-        iter->destination_url.spec(), iter->allowed_to_be_default_match));
-}
-
-void ShortcutsProviderTest::SetShouldContain::operator()(
-    const ExpectedURLAndAllowedToBeDefault& expected) {
-  EXPECT_EQ(1U, matches_.erase(expected));
-}
-
-void ShortcutsProviderTest::RunTest(
-    const base::string16 text,
-    bool prevent_inline_autocomplete,
-    const ExpectedURLs& expected_urls,
-    std::string expected_top_result,
-    base::string16 top_result_inline_autocompletion) {
-  base::MessageLoop::current()->RunUntilIdle();
-  AutocompleteInput input(text, base::string16::npos, std::string(), GURL(),
-                          metrics::OmniboxEventProto::INVALID_SPEC,
-                          prevent_inline_autocomplete, false, true, true, false,
-                          TestSchemeClassifier());
-  provider_->Start(input, false);
-  EXPECT_TRUE(provider_->done());
-
-  ac_matches_ = provider_->matches();
-
-  // We should have gotten back at most AutocompleteProvider::kMaxMatches.
-  EXPECT_LE(ac_matches_.size(), AutocompleteProvider::kMaxMatches);
-
-  // If the number of expected and actual matches aren't equal then we need
-  // test no further, but let's do anyway so that we know which URLs failed.
-  EXPECT_EQ(expected_urls.size(), ac_matches_.size());
-
-  // Verify that all expected URLs were found and that all found URLs
-  // were expected.
-  std::set<ExpectedURLAndAllowedToBeDefault> Leftovers =
-      for_each(expected_urls.begin(), expected_urls.end(),
-               SetShouldContain(ac_matches_)).Leftovers();
-  EXPECT_EQ(0U, Leftovers.size());
-
-  // See if we got the expected top scorer.
-  if (!ac_matches_.empty()) {
-    std::partial_sort(ac_matches_.begin(), ac_matches_.begin() + 1,
-                      ac_matches_.end(), AutocompleteMatch::MoreRelevant);
-    EXPECT_EQ(expected_top_result, ac_matches_[0].destination_url.spec());
-    EXPECT_EQ(top_result_inline_autocompletion,
-              ac_matches_[0].inline_autocompletion);
-  }
-}
-
 int ShortcutsProviderTest::CalculateScore(
     const std::string& terms,
     const ShortcutsDatabase::Shortcut& shortcut,
     int max_relevance) {
   return provider_->CalculateScore(ASCIIToUTF16(terms), shortcut,
                                    max_relevance);
 }
 
 // Actual tests ---------------------------------------------------------------
 
 TEST_F(ShortcutsProviderTest, SimpleSingleMatch) {
   base::string16 text(ASCIIToUTF16("go"));
   std::string expected_url("http://www.google.com/");
-  ExpectedURLs expected_urls;
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(expected_url, true));
-  RunTest(text, false, expected_urls, expected_url, ASCIIToUTF16("ogle.com"));
+  ShortcutExpectedURLs expected_urls;
+  expected_urls.push_back(
+      ShortcutExpectedURLAndAllowedToBeDefault(expected_url, true));
+  RunShortcutsProviderTest(provider_, text, false, expected_urls, expected_url,
+                           ASCIIToUTF16("ogle.com"));
 
   // Same test with prevent inline autocomplete.
   expected_urls.clear();
   expected_urls.push_back(
-      ExpectedURLAndAllowedToBeDefault(expected_url, false));
+      ShortcutExpectedURLAndAllowedToBeDefault(expected_url, false));
   // The match will have an |inline_autocompletion| set, but the value will not
   // be used because |allowed_to_be_default_match| will be false.
-  RunTest(text, true, expected_urls, expected_url, ASCIIToUTF16("ogle.com"));
+  RunShortcutsProviderTest(provider_, text, true, expected_urls, expected_url,
+                           ASCIIToUTF16("ogle.com"));
 
   // A pair of analogous tests where the shortcut ends at the end of
   // |fill_into_edit|.  This exercises the inline autocompletion and default
   // match code.
   text = ASCIIToUTF16("abcdef.com");
   expected_url = "http://abcdef.com/";
   expected_urls.clear();
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(expected_url, true));
-  RunTest(text, false, expected_urls, expected_url, base::string16());
+  expected_urls.push_back(
+      ShortcutExpectedURLAndAllowedToBeDefault(expected_url, true));
+  RunShortcutsProviderTest(provider_, text, false, expected_urls, expected_url,
+                           base::string16());
   // With prevent inline autocomplete, the suggestion should be the same
   // (because there is no completion).
-  RunTest(text, true, expected_urls, expected_url, base::string16());
+  RunShortcutsProviderTest(provider_, text, true, expected_urls, expected_url,
+                           base::string16());
 
   // Another test, simply for a query match type, not a navigation URL match
   // type.
   text = ASCIIToUTF16("que");
   expected_url = "https://www.google.com/search?q=query";
   expected_urls.clear();
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(expected_url, true));
-  RunTest(text, false, expected_urls, expected_url, ASCIIToUTF16("ry"));
+  expected_urls.push_back(
+      ShortcutExpectedURLAndAllowedToBeDefault(expected_url, true));
+  RunShortcutsProviderTest(provider_, text, false, expected_urls, expected_url,
+                           ASCIIToUTF16("ry"));
 
   // Same test with prevent inline autocomplete.
   expected_urls.clear();
   expected_urls.push_back(
-      ExpectedURLAndAllowedToBeDefault(expected_url, false));
+      ShortcutExpectedURLAndAllowedToBeDefault(expected_url, false));
   // The match will have an |inline_autocompletion| set, but the value will not
   // be used because |allowed_to_be_default_match| will be false.
-  RunTest(text, true, expected_urls, expected_url, ASCIIToUTF16("ry"));
+  RunShortcutsProviderTest(provider_, text, true, expected_urls, expected_url,
+                           ASCIIToUTF16("ry"));
 
   // A pair of analogous tests where the shortcut ends at the end of
   // |fill_into_edit|.  This exercises the inline autocompletion and default
   // match code.
   text = ASCIIToUTF16("query");
   expected_urls.clear();
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(expected_url, true));
-  RunTest(text, false, expected_urls, expected_url, base::string16());
+  expected_urls.push_back(
+      ShortcutExpectedURLAndAllowedToBeDefault(expected_url, true));
+  RunShortcutsProviderTest(provider_, text, false, expected_urls, expected_url,
+                           base::string16());
   // With prevent inline autocomplete, the suggestion should be the same
   // (because there is no completion).
-  RunTest(text, true, expected_urls, expected_url, base::string16());
+  RunShortcutsProviderTest(provider_, text, true, expected_urls, expected_url,
+                           base::string16());
 
   // Now the shortcut ends at the end of |fill_into_edit| but has a
   // non-droppable prefix.  ("www.", for instance, is not droppable for
   // queries.)
   text = ASCIIToUTF16("word");
   expected_url = "https://www.google.com/search?q=www.word";
   expected_urls.clear();
   expected_urls.push_back(
-      ExpectedURLAndAllowedToBeDefault(expected_url, false));
-  RunTest(text, false, expected_urls, expected_url, base::string16());
+      ShortcutExpectedURLAndAllowedToBeDefault(expected_url, false));
+  RunShortcutsProviderTest(provider_, text, false, expected_urls, expected_url,
+                           base::string16());
 }
 
 // These tests are like those in SimpleSingleMatch but more complex,
 // involving URLs that need to be fixed up to match properly.
 TEST_F(ShortcutsProviderTest, TrickySingleMatch) {
   // Test that about: URLs are fixed up/transformed to chrome:// URLs.
   base::string16 text(ASCIIToUTF16("about:o"));
   std::string expected_url("chrome://omnibox/");
-  ExpectedURLs expected_urls;
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(expected_url, true));
-  RunTest(text, false, expected_urls, expected_url, ASCIIToUTF16("mnibox"));
+  ShortcutExpectedURLs expected_urls;
+  expected_urls.push_back(
+      ShortcutExpectedURLAndAllowedToBeDefault(expected_url, true));
+  RunShortcutsProviderTest(provider_, text, false, expected_urls, expected_url,
+                           ASCIIToUTF16("mnibox"));
 
   // Same test with prevent inline autocomplete.
   expected_urls.clear();
   expected_urls.push_back(
-      ExpectedURLAndAllowedToBeDefault(expected_url, false));
+      ShortcutExpectedURLAndAllowedToBeDefault(expected_url, false));
   // The match will have an |inline_autocompletion| set, but the value will not
   // be used because |allowed_to_be_default_match| will be false.
-  RunTest(text, true, expected_urls, expected_url, ASCIIToUTF16("mnibox"));
+  RunShortcutsProviderTest(provider_, text, true, expected_urls, expected_url,
+                           ASCIIToUTF16("mnibox"));
 
   // Test that an input with a space can match URLs with a (escaped) space.
   // This would fail if we didn't try to lookup the un-fixed-up string.
   text = ASCIIToUTF16("www/real sp");
   expected_url = "http://www/real%20space/long-url-with-space.html";
   expected_urls.clear();
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(expected_url, true));
-  RunTest(text, false, expected_urls, expected_url,
-          ASCIIToUTF16("ace/long-url-with-space.html"));
+  expected_urls.push_back(
+      ShortcutExpectedURLAndAllowedToBeDefault(expected_url, true));
+  RunShortcutsProviderTest(provider_, text, false, expected_urls, expected_url,
+                           ASCIIToUTF16("ace/long-url-with-space.html"));
 
   // Same test with prevent inline autocomplete.
   expected_urls.clear();
   expected_urls.push_back(
-      ExpectedURLAndAllowedToBeDefault(expected_url, false));
+      ShortcutExpectedURLAndAllowedToBeDefault(expected_url, false));
   // The match will have an |inline_autocompletion| set, but the value will not
   // be used because |allowed_to_be_default_match| will be false.
-  RunTest(text, true, expected_urls, expected_url,
-          ASCIIToUTF16("ace/long-url-with-space.html"));
+  RunShortcutsProviderTest(provider_, text, true, expected_urls, expected_url,
+                           ASCIIToUTF16("ace/long-url-with-space.html"));
 
   // Test when the user input has a trailing slash but fill_into_edit does
   // not.  This should still be allowed to be default.
   text = ASCIIToUTF16("notrailing.com/");
   expected_url = "http://notrailing.com/";
   expected_urls.clear();
   expected_urls.push_back(
-      ExpectedURLAndAllowedToBeDefault(expected_url, true));
-  RunTest(text, true, expected_urls, expected_url, base::string16());
+      ShortcutExpectedURLAndAllowedToBeDefault(expected_url, true));
+  RunShortcutsProviderTest(provider_, text, true, expected_urls, expected_url,
+                           base::string16());
 
   // Test when the user input has a typo that can be fixed up for matching
   // fill_into_edit.  This should still be allowed to be default.
   text = ASCIIToUTF16("http:///foo.com");
   expected_url = "http://foo.com/";
   expected_urls.clear();
   expected_urls.push_back(
-      ExpectedURLAndAllowedToBeDefault(expected_url, true));
-  RunTest(text, true, expected_urls, expected_url, base::string16());
+      ShortcutExpectedURLAndAllowedToBeDefault(expected_url, true));
+  RunShortcutsProviderTest(provider_, text, true, expected_urls, expected_url,
+                           base::string16());
 
   // A foursome of tests to verify that trailing spaces prevent the shortcut
   // from being allowed to be the default match.  For each of two tests, we
   // first verify that the match is allowed to be default without the trailing
   // space but is not allowed to be default with the trailing space.  In both
   // of these with-trailing-space cases, we actually get an
   // inline_autocompletion, though it's never used because the match is
   // prohibited from being default.
   text = ASCIIToUTF16("trailing1");
   expected_url = "http://trailing1.com/";
   expected_urls.clear();
   expected_urls.push_back(
-      ExpectedURLAndAllowedToBeDefault(expected_url, true));
-  RunTest(text, false, expected_urls, expected_url, ASCIIToUTF16(".com"));
+      ShortcutExpectedURLAndAllowedToBeDefault(expected_url, true));
+  RunShortcutsProviderTest(provider_, text, false, expected_urls, expected_url,
+                           ASCIIToUTF16(".com"));
   text = ASCIIToUTF16("trailing1 ");
   expected_urls.clear();
   expected_urls.push_back(
-      ExpectedURLAndAllowedToBeDefault(expected_url, false));
-  RunTest(text, false, expected_urls, expected_url, ASCIIToUTF16(".com"));
+      ShortcutExpectedURLAndAllowedToBeDefault(expected_url, false));
+  RunShortcutsProviderTest(provider_, text, false, expected_urls, expected_url,
+                           ASCIIToUTF16(".com"));
   text = ASCIIToUTF16("about:trailing2");
   expected_url = "chrome://trailing2blah/";
   expected_urls.clear();
   expected_urls.push_back(
-      ExpectedURLAndAllowedToBeDefault(expected_url, true));
-  RunTest(text, false, expected_urls, expected_url, ASCIIToUTF16("blah"));
+      ShortcutExpectedURLAndAllowedToBeDefault(expected_url, true));
+  RunShortcutsProviderTest(provider_, text, false, expected_urls, expected_url,
+                           ASCIIToUTF16("blah"));
   text = ASCIIToUTF16("about:trailing2 ");
   expected_urls.clear();
   expected_urls.push_back(
-      ExpectedURLAndAllowedToBeDefault(expected_url, false));
-  RunTest(text, false, expected_urls, expected_url, ASCIIToUTF16("blah"));
+      ShortcutExpectedURLAndAllowedToBeDefault(expected_url, false));
+  RunShortcutsProviderTest(provider_, text, false, expected_urls, expected_url,
+                           ASCIIToUTF16("blah"));
 }
 
 TEST_F(ShortcutsProviderTest, MultiMatch) {
   base::string16 text(ASCIIToUTF16("NEWS"));
-  ExpectedURLs expected_urls;
+  ShortcutExpectedURLs expected_urls;
   // Scores high because of completion length.
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(
-      "http://slashdot.org/", false));
+  expected_urls.push_back(
+      ShortcutExpectedURLAndAllowedToBeDefault("http://slashdot.org/", false));
   // Scores high because of visit count.
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(
+  expected_urls.push_back(ShortcutExpectedURLAndAllowedToBeDefault(
       "http://sports.yahoo.com/", false));
   // Scores high because of visit count but less match span,
   // which is more important.
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(
+  expected_urls.push_back(ShortcutExpectedURLAndAllowedToBeDefault(
       "http://www.cnn.com/index.html", false));
-  RunTest(text, false, expected_urls, "http://slashdot.org/", base::string16());
+  RunShortcutsProviderTest(provider_, text, false, expected_urls,
+                           "http://slashdot.org/", base::string16());
 }
 
 TEST_F(ShortcutsProviderTest, RemoveDuplicates) {
   base::string16 text(ASCIIToUTF16("dupl"));
-  ExpectedURLs expected_urls;
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(
-      "http://duplicate.com/", true));
+  ShortcutExpectedURLs expected_urls;
+  expected_urls.push_back(
+      ShortcutExpectedURLAndAllowedToBeDefault("http://duplicate.com/", true));
   // Make sure the URL only appears once in the output list.
-  RunTest(text, false, expected_urls, "http://duplicate.com/",
-          ASCIIToUTF16("icate.com"));
+  RunShortcutsProviderTest(provider_, text, false, expected_urls,
+                           "http://duplicate.com/", ASCIIToUTF16("icate.com"));
 }
 
 TEST_F(ShortcutsProviderTest, TypedCountMatches) {
   base::string16 text(ASCIIToUTF16("just"));
-  ExpectedURLs expected_urls;
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(
+  ShortcutExpectedURLs expected_urls;
+  expected_urls.push_back(ShortcutExpectedURLAndAllowedToBeDefault(
       "http://www.testsite.com/b.html", false));
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(
+  expected_urls.push_back(ShortcutExpectedURLAndAllowedToBeDefault(
       "http://www.testsite.com/a.html", false));
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(
+  expected_urls.push_back(ShortcutExpectedURLAndAllowedToBeDefault(
       "http://www.testsite.com/c.html", false));
-  RunTest(text, false, expected_urls, "http://www.testsite.com/b.html",
-          base::string16());
+  RunShortcutsProviderTest(provider_, text, false, expected_urls,
+                           "http://www.testsite.com/b.html", base::string16());
 }
 
 TEST_F(ShortcutsProviderTest, FragmentLengthMatches) {
   base::string16 text(ASCIIToUTF16("just a"));
-  ExpectedURLs expected_urls;
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(
+  ShortcutExpectedURLs expected_urls;
+  expected_urls.push_back(ShortcutExpectedURLAndAllowedToBeDefault(
       "http://www.testsite.com/d.html", false));
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(
+  expected_urls.push_back(ShortcutExpectedURLAndAllowedToBeDefault(
       "http://www.testsite.com/e.html", false));
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(
+  expected_urls.push_back(ShortcutExpectedURLAndAllowedToBeDefault(
       "http://www.testsite.com/f.html", false));
-  RunTest(text, false, expected_urls, "http://www.testsite.com/d.html",
-          base::string16());
+  RunShortcutsProviderTest(provider_, text, false, expected_urls,
+                           "http://www.testsite.com/d.html", base::string16());
 }
 
 TEST_F(ShortcutsProviderTest, DaysAgoMatches) {
   base::string16 text(ASCIIToUTF16("ago"));
-  ExpectedURLs expected_urls;
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(
+  ShortcutExpectedURLs expected_urls;
+  expected_urls.push_back(ShortcutExpectedURLAndAllowedToBeDefault(
       "http://www.daysagotest.com/a.html", false));
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(
+  expected_urls.push_back(ShortcutExpectedURLAndAllowedToBeDefault(
       "http://www.daysagotest.com/b.html", false));
-  expected_urls.push_back(ExpectedURLAndAllowedToBeDefault(
+  expected_urls.push_back(ShortcutExpectedURLAndAllowedToBeDefault(
       "http://www.daysagotest.com/c.html", false));
-  RunTest(text, false, expected_urls, "http://www.daysagotest.com/a.html",
-          base::string16());
+  RunShortcutsProviderTest(provider_, text, false, expected_urls,
+                           "http://www.daysagotest.com/a.html",
+                           base::string16());
 }
 
 TEST_F(ShortcutsProviderTest, ClassifyAllMatchesInString) {
   ACMatchClassifications matches =
       AutocompleteMatch::ClassificationsFromString("0,0");
   ClassifyTest classify_test(ASCIIToUTF16("A man, a plan, a canal Panama"),
                              matches);
 
   ACMatchClassifications spans_a = classify_test.RunTest(ASCIIToUTF16("man"));
   // ACMatch spans should be: '--MMM------------------------'
@@ skipping 153 matching lines @@
       AutocompleteMatchType::HISTORY_TITLE, "", 1, 1},
     { "BD85DBA2-8C29-49F9-84AE-48E1E90881F4", "delete", "www.deletetest.com/2",
       "http://www.deletetest.com/2", "http://www.deletetest.com/2", "0,2",
       "Erase this shortcut!", "0,0", ui::PAGE_TRANSITION_TYPED,
       AutocompleteMatchType::HISTORY_URL, "", 1, 1},
   };
 
   scoped_refptr<ShortcutsBackend> backend = client_->GetShortcutsBackend();
   size_t original_shortcuts_count = backend->shortcuts_map().size();
 
-  FillData(shortcuts_to_test_delete, arraysize(shortcuts_to_test_delete));
+  PopulateShortcutsBackendWithTestShortcutData(
+      client_->GetShortcutsBackend(), shortcuts_to_test_delete,
+      arraysize(shortcuts_to_test_delete));
 
   EXPECT_EQ(original_shortcuts_count + 4, backend->shortcuts_map().size());
   EXPECT_FALSE(backend->shortcuts_map().end() ==
                backend->shortcuts_map().find(ASCIIToUTF16("delete")));
   EXPECT_FALSE(backend->shortcuts_map().end() ==
                backend->shortcuts_map().find(ASCIIToUTF16("erase")));
 
   AutocompleteMatch match(
       provider_.get(), 1200, true, AutocompleteMatchType::HISTORY_TITLE);
 
@@ skipping 23 matching lines @@
 }
 
 TEST_F(ShortcutsProviderTest, DoesNotProvideOnFocus) {
   AutocompleteInput input(
       ASCIIToUTF16("about:o"), base::string16::npos, std::string(), GURL(),
       metrics::OmniboxEventProto::INVALID_SPEC, false, false, true, true, true,
       TestSchemeClassifier());
   provider_->Start(input, false);
   EXPECT_TRUE(provider_->matches().empty());
 }