Change InstantAutocompleteResult::Type to be AutocompleteMatchType::Type.

chrome/browser/ui/search/instant_extended_interactive_uitest.cc

 // Copyright 2013 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 <sstream>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
@@ skipping 1703 matching lines @@
 
   // Manufacture a few autocomplete results and get them down to the page.
   std::vector<InstantAutocompleteResult> autocomplete_results;
   for (int i = 0; i < 3; ++i) {
     std::string description(base::StringPrintf("Test Description %d", i));
     std::string url(base::StringPrintf("http://www.testurl%d.com", i));
 
     InstantAutocompleteResult res;
     res.provider = ASCIIToUTF16(AutocompleteProvider::TypeToString(
         AutocompleteProvider::TYPE_BUILTIN));
-    res.type = ASCIIToUTF16(AutocompleteMatchType::ToString(
-        AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED)),
+    res.type = AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED,
     res.description = ASCIIToUTF16(description);
     res.destination_url = ASCIIToUTF16(url);
     res.transition = content::PAGE_TRANSITION_TYPED;
     res.relevance = 42 + i;
 
     autocomplete_results.push_back(res);
   }
   instant()->overlay()->SendAutocompleteResults(autocomplete_results);
 
   // Apparently, one needs to access nativeSuggestions before
@@ skipping 778 matching lines @@
 
 // Test that if the LogDropdownShown() call records a histogram value.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, LogDropdownShown) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   int64 histogramValue = GetHistogramCount("Instant.TimeToFirstShowFromWeb");
   ASSERT_TRUE(SetOmniboxTextAndWaitForOverlayToShow("a"));
   EXPECT_EQ(histogramValue + 1,
             GetHistogramCount("Instant.TimeToFirstShowFromWeb"));
 }