Remove the Menu object, converting all the remaining callers to use Menu2. I'...

chrome/browser/autocomplete/search_provider.cc

 // Copyright (c) 2009 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 "chrome/browser/autocomplete/search_provider.h"
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 698 matching lines @@
       } else {
         // TODO(beng): ACMatchClassification::MATCH now seems to just mean
         //             "bold" this. Consider modifying the terminology.
         // We don't iterate over the string here annotating all matches because
         // it looks odd to have every occurrence of a substring that may be as
         // short as a single character highlighted in a query suggestion result,
         // e.g. for input text "s" and query string "southwest airlines", it
         // looks odd if both the first and last s are highlighted.
         if (input_position != 0) {
           match.contents_class.push_back(
-              ACMatchClassification(0, ACMatchClassification::MATCH));
+              ACMatchClassification(0, ACMatchClassification::NONE));
         }
         match.contents_class.push_back(
-            ACMatchClassification(input_position, ACMatchClassification::NONE));
+            ACMatchClassification(input_position, ACMatchClassification::DIM));
         size_t next_fragment_position = input_position + input_text.length();
         if (next_fragment_position < query_string.length()) {
           match.contents_class.push_back(
               ACMatchClassification(next_fragment_position,
-                                    ACMatchClassification::MATCH));
+                                    ACMatchClassification::NONE));
         }
       }
     } else {
       // Otherwise, we're dealing with the "default search" result which has no
       // completion, but has the search provider name as the description.
       match.contents.assign(query_string);
       match.contents_class.push_back(
           ACMatchClassification(0, ACMatchClassification::NONE));
       match.description.assign(l10n_util::GetStringF(
           IDS_AUTOCOMPLETE_SEARCH_DESCRIPTION,
@@ skipping 78 matching lines @@
   // values preserve that property.  Otherwise, if the user starts editing a
   // suggestion, non-Search results will suddenly appear.
   if (input_.type() == AutocompleteInput::FORCED_QUERY)
     match.fill_into_edit.assign(L"?");
   match.fill_into_edit.append(match.contents);
   // TODO(pkasting): http://b/1112879 These should perhaps be
   // inline-autocompletable?
 
   return match;
 }