Fix the extension activity log UI.

chrome/browser/ui/webui/extensions/extension_activity_ui.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 "chrome/browser/ui/webui/extensions/extension_activity_ui.h"
 
 #include "base/bind.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
@@ skipping 14 matching lines @@
 
   ChromeWebUIDataSource* source =
       new ChromeWebUIDataSource(chrome::kChromeUIExtensionActivityHost);
 
   // Localized strings.
   source->AddLocalizedString("extensionActivity", IDS_EXTENSION_ACTIVITY_TITLE);
   source->AddLocalizedString("extensionActivityApiCall",
                              IDS_EXTENSION_ACTIVITY_API_CALL);
   source->AddLocalizedString("extensionActivityApiBlock",
                              IDS_EXTENSION_ACTIVITY_API_BLOCK);
+  source->set_use_json_js_format_v2();
   source->set_json_path("strings.js");
 
   // Resources.
   source->add_resource_path("extension_activity.js", IDR_EXTENSION_ACTIVITY_JS);
   source->set_default_resource(IDR_EXTENSION_ACTIVITY_HTML);
 
+  Profile* profile = Profile::FromWebUI(web_ui);
+  ChromeURLDataManager::AddDataSource(profile, source);
+  ChromeURLDataManager::AddDataSource(profile, new SharedResourcesDataSource());
+
   // Callback handlers.
   web_ui->RegisterMessageCallback("requestExtensionData",
       base::Bind(&ExtensionActivityUI::HandleRequestExtensionData,
                  base::Unretained(this)));
-
-  Profile* profile = Profile::FromWebUI(web_ui);
-  ChromeURLDataManager::AddDataSource(profile, source);
-  ChromeURLDataManager::AddDataSource(profile, new SharedResourcesDataSource());
 }
 
 ExtensionActivityUI::~ExtensionActivityUI() {
   if (extension_)
     ExtensionActivityLog::GetInstance()->RemoveObserver(extension_, this);
 }
 
 void ExtensionActivityUI::HandleRequestExtensionData(
     const base::ListValue* args) {
   DCHECK_EQ(1U, args->GetSize());
@@ skipping 33 matching lines @@
 void ExtensionActivityUI::OnExtensionActivity(
       const extensions::Extension* extension,
       ExtensionActivityLog::Activity activity,
       const std::string& msg) {
   DictionaryValue result;
   result.SetInteger("activity", activity);
   result.SetString("message", msg);
   web_ui()->CallJavascriptFunction("extension_activity.handleExtensionActivity",
                                    result);
 }