Make the app provider match highlighting use the existing ClassifyMatchXXX() machinery, and set t...

chrome/browser/autocomplete/extension_app_provider_unittest.cc

 // Copyright (c) 2011 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 "base/basictypes.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/test/testing_browser_process_test.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/extension_app_provider.h"
@@ skipping 26 matching lines @@
 
 void ExtensionAppProviderTest::SetUp() {
   profile_.reset(new TestingProfile());
   profile_->CreateHistoryService(true, false);
   profile_->BlockUntilHistoryProcessesPendingRequests();
   history_service_ = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
 
   app_provider_ = new ExtensionAppProvider(NULL, profile_.get());
 
   struct ExtensionApps {
-    std::string app_name;
-    std::string url;
-    std::string title;
+    const char* app_name;
+    const char* url;
+    const char* title;
     int typed_count;
   } kExtensionApps[] = {
     {"COYB", "http://asdf/", "COYB", 7},
     {"NSNO", "http://fdsa/", "NSNO", 2},
   };
 
   history::URLDatabase* url_db = history_service_->InMemoryDatabase();
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kExtensionApps); ++i) {
     // Populate the Extension Apps list.
-    app_provider_->AddExtensionAppForTesting(kExtensionApps[i].app_name,
-                                            kExtensionApps[i].url);
+    app_provider_->AddExtensionAppForTesting(
+        ASCIIToUTF16(kExtensionApps[i].app_name),
+        ASCIIToUTF16(kExtensionApps[i].url));
 
     // Populate the InMemoryDatabase.
     history::URLRow info(GURL(kExtensionApps[i].url));
     info.set_title(UTF8ToUTF16(kExtensionApps[i].title));
     info.set_typed_count(kExtensionApps[i].typed_count);
     url_db->AddURL(info);
   }
 }
 
 void ExtensionAppProviderTest::RunTest(
@@ skipping 25 matching lines @@
                                            GURL("http://fdsa/") }},
     // The string 'co' appears in one extension app.
     {ASCIIToUTF16("co"),              1, { GURL("http://asdf/") }},
     // Try with URL matching.
     {ASCIIToUTF16("http://asdf/"),    1, { GURL("http://asdf/") }},
     {ASCIIToUTF16("http://fdsa/"),    1, { GURL("http://fdsa/") }},
   };
 
   RunTest(edit_cases, ARRAYSIZE_UNSAFE(edit_cases));
 }