Componentize kBug464926CrashKey into crash_keys.

components/omnibox/browser/history_quick_provider.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/history_quick_provider.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/debug/crash_logging.h"
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/bookmarks/browser/bookmark_model.h"
+#include "components/crash_keys/crash_keys.h"
 #include "components/history/core/browser/history_database.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/metrics/proto/omnibox_input_type.pb.h"
 #include "components/omnibox/browser/autocomplete_match_type.h"
 #include "components/omnibox/browser/autocomplete_provider_client.h"
 #include "components/omnibox/browser/autocomplete_result.h"
 #include "components/omnibox/browser/history_url_provider.h"
 #include "components/omnibox/browser/in_memory_url_index.h"
 #include "components/omnibox/browser/in_memory_url_index_types.h"
 #include "components/omnibox/browser/omnibox_field_trial.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/url_formatter/url_formatter.h"
 #include "net/base/escape.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "url/third_party/mozilla/url_parse.h"
 #include "url/url_util.h"
 
-namespace {
-
-// Used to help investigate bug 464926.  NOTE: This value is defined multiple
-// places in the codebase due to layering issues. DO NOT change the value here
-// without changing it in all other places that it is defined in the codebase
-// (search for |kBug464926CrashKey|).
-const char kBug464926CrashKey[] = "bug-464926-info";
-
-}  // namespace
-
 bool HistoryQuickProvider::disabled_ = false;
 
 HistoryQuickProvider::HistoryQuickProvider(AutocompleteProviderClient* client)
     : HistoryProvider(AutocompleteProvider::TYPE_HISTORY_QUICK, client),
       languages_(client->GetAcceptLanguages()),
       in_memory_url_index_(client->GetInMemoryURLIndex()) {
 }
 
 void HistoryQuickProvider::Start(const AutocompleteInput& input,
                                  bool minimal_changes) {
@@ skipping 180 matching lines @@
       info.url(), languages_, format_types, net::UnescapeRule::SPACES, nullptr,
       nullptr, &adjustments);
   base::OffsetAdjuster::AdjustOffsets(adjustments, &offsets);
   TermMatches new_matches =
       ReplaceOffsetsInTermMatches(history_match.url_matches, offsets);
   match.contents_class =
       SpansFromTermMatch(new_matches, match.contents.length(), true);
 
   // Set |inline_autocompletion| and |allowed_to_be_default_match| if possible.
   if (history_match.can_inline) {
+    // TODO(mpearson): remove this and all dependency of //components/omnibox
+    // on //components/crash_keys once http://crbug.com/464926 is fixed (i.e.
+    // remove #include, exception in components/omnibox/DEPS, and dependency
+    // in components/omnibox.gypi and components/omnibox/browser/BUILD.gn).
     base::debug::ScopedCrashKey crash_info(
-        kBug464926CrashKey,
+        crash_keys::kBug464926CrashKey,
         info.url().spec().substr(0, 30) + " " +
             base::UTF16ToUTF8(autocomplete_input_.text()).substr(0, 20) + " " +
             base::SizeTToString(history_match.url_matches.size()) + " " +
             base::SizeTToString(offsets.size()));
     CHECK(!new_matches.empty());
     size_t inline_autocomplete_offset = new_matches[0].offset +
         new_matches[0].length;
     // |inline_autocomplete_offset| may be beyond the end of the
     // |fill_into_edit| if the user has typed an URL with a scheme and the
     // last character typed is a slash.  That slash is removed by the
@@ skipping 14 matching lines @@
   match.description = info.title();
   match.description_class = SpansFromTermMatch(
       history_match.title_matches, match.description.length(), false);
 
   match.RecordAdditionalInfo("typed count", info.typed_count());
   match.RecordAdditionalInfo("visit count", info.visit_count());
   match.RecordAdditionalInfo("last visit", info.last_visit());
 
   return match;
 }