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

BUG=101600, 94925
TEST=none
TBR=mnissler

Review URL: http://codereview.chromium.org/8573021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110235 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/autocomplete/builtin_provider.cc b/chrome/browser/autocomplete/builtin_provider.cc
index 54a1b60..fd0c677 100644
--- a/chrome/browser/autocomplete/builtin_provider.cc
+++ b/chrome/browser/autocomplete/builtin_provider.cc
@@ -63,13 +63,13 @@ void BuiltinProvider::Start(const AutocompleteInput& input,
       (input.matches_requested() == AutocompleteInput::BEST_MATCH))
     return;
 
-  static const string16 kAbout = ASCIIToUTF16(chrome::kAboutScheme) +
+  const string16 kAbout = ASCIIToUTF16(chrome::kAboutScheme) +
       ASCIIToUTF16(chrome::kStandardSchemeSeparator);
-  static const string16 kChrome = ASCIIToUTF16(chrome::kChromeUIScheme) +
+  const string16 kChrome = ASCIIToUTF16(chrome::kChromeUIScheme) +
       ASCIIToUTF16(chrome::kStandardSchemeSeparator);
 
-  static const int kUrl = ACMatchClassification::URL;
-  static const int kMatch = kUrl | ACMatchClassification::MATCH;
+  const int kUrl = ACMatchClassification::URL;
+  const int kMatch = kUrl | ACMatchClassification::MATCH;
 
   string16 text = input.text();
   bool starting_chrome = StartsWith(kChrome, text, false);
@@ -77,7 +77,7 @@ void BuiltinProvider::Start(const AutocompleteInput& input,
     ACMatchClassifications styles;
     // Highlight the input portion matching "chrome://"; or if the user has
     // input "about:" (with optional slashes), highlight the whole "chrome://".
-    static const size_t kAboutSchemeLength = strlen(chrome::kAboutScheme);
+    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();
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc
index 9453e19..62d5b92 100644
--- a/chrome/browser/autocomplete/search_provider.cc
+++ b/chrome/browser/autocomplete/search_provider.cc
@@ -330,7 +330,7 @@ void SearchProvider::StartOrStopSuggestQuery(bool minimal_changes) {
   // Don't send any queries to the server until some time has elapsed after
   // the last keypress, to avoid flooding the server with requests we are
   // likely to end up throwing away anyway.
-  static const int kQueryDelayMs = 200;
+  const int kQueryDelayMs = 200;
 
   if (!IsQuerySuitableForSuggest()) {
     StopSuggest();
@@ -491,7 +491,7 @@ bool SearchProvider::ParseSuggestResults(Value* root_val,
       DictionaryValue* dict_val = static_cast<DictionaryValue*>(optional_val);
 
       // Parse Google Suggest specific type extension.
-      static const std::string kGoogleSuggestType("google:suggesttype");
+      const std::string kGoogleSuggestType("google:suggesttype");
       if (dict_val->HasKey(kGoogleSuggestType))
         dict_val->GetList(kGoogleSuggestType, &type_list);
     }