Revert 110235 - chrome: Remove 14 exit time destructors and 2 static initializers.

chrome/browser/autocomplete/builtin_provider.cc

Index: chrome/browser/autocomplete/builtin_provider.cc
===================================================================
--- chrome/browser/autocomplete/builtin_provider.cc	(revision 110237)
+++ chrome/browser/autocomplete/builtin_provider.cc	(working copy)
@@ -63,13 +63,13 @@
       (input.matches_requested() == AutocompleteInput::BEST_MATCH))
     return;
 
-  const string16 kAbout = ASCIIToUTF16(chrome::kAboutScheme) +
+  static const string16 kAbout = ASCIIToUTF16(chrome::kAboutScheme) +
       ASCIIToUTF16(chrome::kStandardSchemeSeparator);
-  const string16 kChrome = ASCIIToUTF16(chrome::kChromeUIScheme) +
+  static const string16 kChrome = ASCIIToUTF16(chrome::kChromeUIScheme) +
       ASCIIToUTF16(chrome::kStandardSchemeSeparator);
 
-  const int kUrl = ACMatchClassification::URL;
-  const int kMatch = kUrl | ACMatchClassification::MATCH;
+  static const int kUrl = ACMatchClassification::URL;
+  static const int kMatch = kUrl | ACMatchClassification::MATCH;
 
   string16 text = input.text();
   bool starting_chrome = StartsWith(kChrome, text, false);
@@ -77,7 +77,7 @@
     ACMatchClassifications styles;
     // Highlight the input portion matching "chrome://"; or if the user has
     // input "about:" (with optional slashes), highlight the whole "chrome://".
-    const size_t kAboutSchemeLength = strlen(chrome::kAboutScheme);
+    static const size_t kAboutSchemeLength = strlen(chrome::kAboutScheme);
     bool highlight = starting_chrome || text.length() > kAboutSchemeLength;
     styles.push_back(ACMatchClassification(0, highlight ? kMatch : kUrl));
     size_t offset = starting_chrome ? text.length() : kChrome.length();