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

version_extension_ in MetricsLogBase was only used in the MetricsLog
subclass, so move it to there.

BUG=101600,94925
TEST=none


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

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

2 files changed, 4 insertions, 6 deletions

diff --git a/chrome/renderer/extensions/schema_generated_bindings.cc b/chrome/renderer/extensions/schema_generated_bindings.cc
index 902b160..55d3220 100644
--- a/chrome/renderer/extensions/schema_generated_bindings.cc
+++ b/chrome/renderer/extensions/schema_generated_bindings.cc
@@ -324,16 +324,14 @@ class ExtensionImpl : public ChromeV8Extension {
         "fjcibdnjlbfnbfdjneajpipnlcppleek",
         "oflbaaikkabfdfkimeclgkackhdkpnip"  // Testing extension.
     };
-    static const std::vector<std::string> allowed_ids(
-        kAllowedIds, kAllowedIds + arraysize(kAllowedIds));
 
     ExtensionImpl* v8_extension = GetFromArguments<ExtensionImpl>(args);
     const ::Extension* extension =
         v8_extension->GetExtensionForCurrentRenderView();
     if (!extension)
       return v8::Undefined();
-    if (allowed_ids.end() == std::find(
-        allowed_ids.begin(), allowed_ids.end(), extension->id())) {
+    if (kAllowedIds + arraysize(kAllowedIds) == std::find(
+        kAllowedIds, kAllowedIds + arraysize(kAllowedIds), extension->id())) {
       return v8::Undefined();
     }
 
diff --git a/chrome/renderer/searchbox_extension.cc b/chrome/renderer/searchbox_extension.cc
index 1872cb1..1663c5a 100644
--- a/chrome/renderer/searchbox_extension.cc
+++ b/chrome/renderer/searchbox_extension.cc
@@ -420,8 +420,8 @@ bool SearchBoxExtension::PageSupportsInstant(WebFrame* frame) {
   // The deprecated API needs to notify the page of events it may have missed.
   // This isn't necessary in the SearchBox API, since the page can query the
   // API at any time.
-  static std::string init_script(
-      StringPrintf(kInitScript, kSetOmniboxBoundsScript, kUserInputScript));
+  CR_DEFINE_STATIC_LOCAL(std::string, init_script,
+      (StringPrintf(kInitScript, kSetOmniboxBoundsScript, kUserInputScript)));
   if (supports_deprecated_api) {
     frame->executeScript(WebScriptSource(WebString::fromUTF8(init_script)));
   }