Update more extension manifests to manifest_version 2

BUG=62897
TBR=aa
Review URL: http://codereview.chromium.org/8784009

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

chrome/test/data/extensions/allow_silent_upgrade/allhosts1_new.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://*/"
   ]

chrome/test/data/extensions/allow_silent_upgrade/allhosts1_old.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://*/"
   ]

chrome/test/data/extensions/allow_silent_upgrade/allhosts2_new.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://google.com/"
   ]

chrome/test/data/extensions/allow_silent_upgrade/allhosts2_old.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://*/"
   ]

chrome/test/data/extensions/allow_silent_upgrade/allhosts3_new.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://*/"
   ]

chrome/test/data/extensions/allow_silent_upgrade/allhosts3_old.json

 {
   "name": "allow silent update",
-  "version": "1.0"
+  "version": "1.0",
+  "manifest_version": 2
 }

chrome/test/data/extensions/allow_silent_upgrade/hosts1_new.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://www.google.com/",
     "http://www.reddit.com/"

chrome/test/data/extensions/allow_silent_upgrade/hosts1_old.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://www.google.com/",
     "http://www.reddit.com/"

chrome/test/data/extensions/allow_silent_upgrade/hosts2_new.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://*.www.google.com/",
     "https://www.reddit.com/"

chrome/test/data/extensions/allow_silent_upgrade/hosts2_old.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://www.google.com/",
     "http://www.reddit.com/"

chrome/test/data/extensions/allow_silent_upgrade/hosts3_new.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://www.google.com/"
   ]

chrome/test/data/extensions/allow_silent_upgrade/hosts3_old.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://www.google.com/",
     "http://www.reddit.com/"

chrome/test/data/extensions/allow_silent_upgrade/hosts4_new.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://www.google.com/",
     "http://www.reddit.com/"

chrome/test/data/extensions/allow_silent_upgrade/hosts4_old.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://www.google.com/"
   ]

chrome/test/data/extensions/allow_silent_upgrade/hosts5_new.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "tabs",
     "notifications",

chrome/test/data/extensions/allow_silent_upgrade/hosts5_old.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "tabs",
     "notifications",

chrome/test/data/extensions/allow_silent_upgrade/hosts6_new.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "tabs",
     "notifications",

chrome/test/data/extensions/allow_silent_upgrade/hosts6_old.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "tabs",
     "notifications",

chrome/test/data/extensions/allow_silent_upgrade/notifications_new.json

-{
-  "name": "allow silent update",
-  "version": "1.0",
-  "permissions": [
-    "notifications"
-  ]
-}
+{
+  "name": "allow silent update",
+  "version": "1.0",
+  "manifest_version": 2,
+  "permissions": [
+    "notifications"
+  ]
+}

chrome/test/data/extensions/allow_silent_upgrade/notifications_old.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
   ]
 }

chrome/test/data/extensions/allow_silent_upgrade/permissions1_new.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "tabs"
   ]

chrome/test/data/extensions/allow_silent_upgrade/permissions1_old.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "tabs"
   ]

chrome/test/data/extensions/allow_silent_upgrade/permissions2_new.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "tabs",
     "bookmarks"

chrome/test/data/extensions/allow_silent_upgrade/permissions2_old.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "tabs"
   ]

chrome/test/data/extensions/allow_silent_upgrade/permissions3_new.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://*/*",
     "tabs"

chrome/test/data/extensions/allow_silent_upgrade/permissions3_old.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://*/*"
   ]

chrome/test/data/extensions/allow_silent_upgrade/permissions4_new.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "plugins": [
     {"path": "foo.dll"}
   ],

chrome/test/data/extensions/allow_silent_upgrade/permissions4_old.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "plugins": [
     {"path": "foo.dll"}
   ]

chrome/test/data/extensions/allow_silent_upgrade/permissions5_new.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "bookmarks","history"
   ]

chrome/test/data/extensions/allow_silent_upgrade/permissions5_old.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "bookmarks"
   ]

chrome/test/data/extensions/allow_silent_upgrade/plugin1_new.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "plugins": [
     { "path": "foo.dll" }
   ]

chrome/test/data/extensions/allow_silent_upgrade/plugin1_old.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "plugins": [
     { "path": "foo.dll" }
   ]

chrome/test/data/extensions/allow_silent_upgrade/plugin2_new.json

 {
   "name": "allow silent update",
-  "version": "1.0"
+  "version": "1.0",
+  "manifest_version": 2
 }

chrome/test/data/extensions/allow_silent_upgrade/plugin2_old.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "plugins": [
     { "path": "foo.dll" }
   ]

chrome/test/data/extensions/allow_silent_upgrade/plugin3_new.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "plugins": [
     { "path": "foo.dll" }
   ]

chrome/test/data/extensions/allow_silent_upgrade/plugin3_old.json

 {
   "name": "allow silent update",
-  "version": "1.0"
+  "version": "1.0",
+  "manifest_version": 2
 }

chrome/test/data/extensions/allow_silent_upgrade/storage_new.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "unlimitedStorage"
   ]

chrome/test/data/extensions/allow_silent_upgrade/storage_old.json

 {
   "name": "allow silent update",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
   ]
 }

chrome/test/data/extensions/app/manifest.json

 {
   "name": "App Test",
   "version": "1",
+  "manifest_version": 2,
   "permissions": [
     "notifications"
   ],

chrome/test/data/extensions/app1/manifest.json

 {
   "name": "Test App 1",
   "version": "1",
+  "manifest_version": 2,
   "permissions": ["unlimited_storage"],
   "app": {
     "urls": [

chrome/test/data/extensions/app2/manifest.json

 {
   "name": "Test App 2",
   "version": "1",
+  "manifest_version": 2,
   "permissions": ["unlimited_storage"],
   "app": {
     "urls": [

chrome/test/data/extensions/app3/manifest.json

 {
   "name": "Test App 3",
   "version": "1",
+  "manifest_version": 2,
   "app": {
     "urls": [
       "http://www.example.com/path1/should_overlap",

chrome/test/data/extensions/app4/manifest.json

 {
   "name": "Test App 4",
   "version": "1",
+  "manifest_version": 2,
   "app": {
     "launch": {
       "web_url": "http://maps.google.com/path5/foo.html"

chrome/test/data/extensions/app_notifications/manifest.json

 {
   "name": "Notifications Test App",
   "version": "0.5",
+  "manifest_version": 2,
   "permissions": ["appNotifications"],
   "app": {
     "launch": {

chrome/test/data/extensions/app_with_panel_container/manifest.json

 {
   "name": "App Test: panel container",
   "version": "1",
+  "manifest_version": 2,
   "permissions": [
     "notifications"
   ],

chrome/test/data/extensions/app_with_tab_container/manifest.json

 {
   "name": "App Test: tab container",
   "version": "1",
+  "manifest_version": 2,
   "permissions": [
     "notifications"
   ],

chrome/test/data/extensions/browsertest/crash_25562/background.html

+<!--
+ * Copyright (c) 2011 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.
+-->
 <html>
-<script>
-  // The Page Action ID.
-  var pageActionId = "TestId";
-
-  // The window this Page Action is associated with.
-  var windowId = -1;
-
-  // The TabId this Page Action is associated with.
-  var tabId = -1;
-
-  // The URL of the page on build.chromium.org.
-  var pageUrl = "";
-
-  chrome.self.onConnect.addListener(function(port) {
-    windowId = port.tab.windowId;
-    tabId = port.tab.id;
-    pageUrl = port.tab.url;
-
-    port.onMessage.addListener(function(mybool) {
-      // Let Chrome know that the PageAction needs to be enabled for this tabId
-      // and for the url of this page.
-      chrome.pageActions.enableForTab(pageActionId,
-                                      {tabId: tabId, url: pageUrl});
-    });
-  });
-</script>
+<script src="background.js"></script>
 </html>

chrome/test/data/extensions/browsertest/crash_25562/background.js

+// Copyright (c) 2011 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.
+
+// The Page Action ID.
+var pageActionId = "TestId";
+
+// The window this Page Action is associated with.
+var windowId = -1;
+
+// The TabId this Page Action is associated with.
+var tabId = -1;
+
+// The URL of the page on build.chromium.org.
+var pageUrl = "";
+
+chrome.self.onConnect.addListener(function(port) {
+  windowId = port.tab.windowId;
+  tabId = port.tab.id;
+  pageUrl = port.tab.url;
+
+  port.onMessage.addListener(function(mybool) {
+    // Let Chrome know that the PageAction needs to be enabled for this tabId
+    // and for the url of this page.
+    chrome.pageActions.enableForTab(pageActionId,
+                                    {tabId: tabId, url: pageUrl});
+  });
+});

chrome/test/data/extensions/browsertest/crash_25562/manifest.json

@@ -13,5 +13,6 @@
       "tooltip": "Page action tooltip"
    } ],
    "permissions": [ "http://*/*" ],
+   "manifest_version": 2,
    "version": "1.0"
 }

chrome/test/data/extensions/browsertest/crash_44415/ExtA/background.html

+<!--
+ * Copyright (c) 2011 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.
+-->
 <html>
 <head>
-<script>
-  chrome.tabs.getSelected(null, function(tab) {
-    chrome.pageAction.show(tab.id);
-  });
-</script>
+<script src="background.js"></script>
 </head>
 </html>

chrome/test/data/extensions/browsertest/crash_44415/ExtA/background.js

+// Copyright (c) 2011 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.
+
+chrome.tabs.getSelected(null, function(tab) {
+  chrome.pageAction.show(tab.id);
+});

chrome/test/data/extensions/browsertest/crash_44415/ExtA/manifest.json

 {
     "name": "Popup Test",
     "version": "1.0",
+  "manifest_version": 2,
     "page_action": {
         "default_icon": "icon.png",
         "popup": "popup.html"

chrome/test/data/extensions/browsertest/crash_44415/ExtB/background.html

+<!--
+ * Copyright (c) 2011 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.
+-->
 <html>
 <head>
-<script>
-  chrome.tabs.getSelected(null, function(tab) {
-    chrome.pageAction.show(tab.id);
-  });
-</script>
+<script src="background.js"></script>
 </head>
 </html>

chrome/test/data/extensions/browsertest/crash_44415/ExtB/background.js

+// Copyright (c) 2011 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.
+
+chrome.tabs.getSelected(null, function(tab) {
+  chrome.pageAction.show(tab.id);
+});

chrome/test/data/extensions/browsertest/crash_44415/ExtB/manifest.json

 {
     "name": "Popup Test2",
     "version": "1.0",
+    "manifest_version": 2,
     "page_action": {
         "default_icon": "icon.png",
         "popup": "popup.html"

chrome/test/data/extensions/browsertest/last_error/bg.html

+<!--
+ * Copyright (c) 2011 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.
+-->
 <html>
   <head>
-    <script>
-function fail() {
-  window.domAutomationController.send(false);
-  throw "Failed!";
-}
-
-function succeed() {
-  window.domAutomationController.send(true);
-}
-
-function testLastError() {
-  // Make sure lastError is not yet set
-  if (chrome.tabs.lastError)
-    fail();
-  
-  var maxTabId = 0;
-
-  // Find the highest tab id
-  chrome.windows.getAll({populate:true}, function(windows) {
-    // Make sure lastError is still not set. (this call have should succeeded).
-    if (chrome.tabs.lastError)
-      fail();
-
-    for (var i = 0; i < windows.length; i++) {
-      var win = windows[i];
-      for (var j = 0; j < win.tabs.length; j++) {
-        var tab = win.tabs[j];
-        if (tab.id > maxTabId)
-          maxTabId = tab.id;
-      }
-    }
-          
-    // Now ask for the next highest tabId.
-    chrome.tabs.get(maxTabId + 1, function(tab) {
-      // Make sure lastError *is* set and tab is not.
-      if (!chrome.extension.lastError ||
-          !chrome.extension.lastError.message ||
-          tab)
-        fail();
-      
-      window.setTimeout(finish, 10);
-    });
-  });
-}
-
-function finish() {
-  // Now make sure lastError is unset outside the callback context.
-  if (chrome.tabs.lastError)
-    fail();
-    
-  succeed();
-}
-    </script>
+    <script src="bg.js"></script>
   </head>
   <body> 
-    <div onclick="testLastError();"> Last Error Test </div>
+    <div> Last Error Test </div>
   </body>
 </html>
 

chrome/test/data/extensions/browsertest/last_error/bg.js

+// Copyright (c) 2011 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.
+
+function fail() {
+  window.domAutomationController.send(false);
+  throw "Failed!";
+}
+
+function succeed() {
+  window.domAutomationController.send(true);
+}
+
+function testLastError() {
+  // Make sure lastError is not yet set
+  if (chrome.tabs.lastError)
+    fail();
+
+  var maxTabId = 0;
+
+  // Find the highest tab id
+  chrome.windows.getAll({populate:true}, function(windows) {
+    // Make sure lastError is still not set. (this call have should succeeded).
+    if (chrome.tabs.lastError)
+      fail();
+
+    for (var i = 0; i < windows.length; i++) {
+      var win = windows[i];
+      for (var j = 0; j < win.tabs.length; j++) {
+        var tab = win.tabs[j];
+        if (tab.id > maxTabId)
+          maxTabId = tab.id;
+      }
+    }
+
+    // Now ask for the next highest tabId.
+    chrome.tabs.get(maxTabId + 1, function(tab) {
+      // Make sure lastError *is* set and tab is not.
+      if (!chrome.extension.lastError ||
+          !chrome.extension.lastError.message ||
+          tab)
+        fail();
+
+      window.setTimeout(finish, 10);
+    });
+  });
+}
+
+function finish() {
+  // Now make sure lastError is unset outside the callback context.
+  if (chrome.tabs.lastError)
+    fail();
+
+  succeed();
+}
+
+document.documentElement.addEventListener("click", function() {
+  testLastError();
+}, true);

chrome/test/data/extensions/browsertest/last_error/manifest.json

@@ -2,6 +2,7 @@
   "name": "lastError",
   "description": "Used by browsertest to test the setting of lastError for callbacks.",
   "version": "0.1",
+  "manifest_version": 2,
   "background_page": "bg.html",
   "permissions": ["tabs"]
 }

chrome/test/data/extensions/browsertest/title_localized/manifest.json

@@ -6,5 +6,6 @@
      "default_icon": "chrome-16.png"
    },
    "permissions": [ "http://*/*" ],
+   "manifest_version": 2,
    "version": "1.0"
 }

chrome/test/data/extensions/browsertest/title_localized_pa/background.html

+<!--
+ * Copyright (c) 2011 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.
+-->
 <html>
-<script>
-  chrome.self.onConnect.addListener(function(port) {
-    port.onMessage.addListener(function(mybool) {
-      // Let Chrome know that the PageAction needs to be enabled for this tabId
-      // and for the url of this page.
-      chrome.pageAction.show(port.tab.id);
-    });
-  });
-</script>
+<script src="background.js"></script>
 </html>

chrome/test/data/extensions/browsertest/title_localized_pa/background.js

+// Copyright (c) 2011 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.
+
+chrome.self.onConnect.addListener(function(port) {
+  port.onMessage.addListener(function(mybool) {
+    // Let Chrome know that the PageAction needs to be enabled for this tabId
+    // and for the url of this page.
+    chrome.pageAction.show(port.tab.id);
+  });
+});

chrome/test/data/extensions/browsertest/title_localized_pa/manifest.json

@@ -11,5 +11,6 @@
      "default_icon": "chrome-16.png"
    },
    "permissions": [ "http://*/*" ],
+   "manifest_version": 2,
    "version": "1.0"
 }

chrome/test/data/extensions/browsertest/url_rewrite/bookmarks/manifest.json

 {
   "name": "Bookmarks manager override test",
   "version": "0.1",
+  "manifest_version": 2,
   "description": "Test chrome://bookmarks override",
   "chrome_url_overrides": {
     "bookmarks": "bookmarks.html"

chrome/test/data/extensions/browsertest/url_rewrite/file_manager/manifest.json

 {
   "name": "File manager override test",
   "version": "0.1",
+  "manifest_version": 2,
   "description": "Test chrome://files override",
   "chrome_url_overrides": {
     "files": "files.html"

chrome/test/data/extensions/browsertest/url_rewrite/newtab/manifest.json

 {
   "name": "New tab override test",
   "version": "0.1",
+  "manifest_version": 2,
   "description": "Test chrome://newtab override",
   "chrome_url_overrides": {
     "newtab": "newtab.html"

chrome/test/data/extensions/common/background_page/manifest.json

@@ -2,5 +2,6 @@
   "description": "Extension which has just a background page",
   "name": "background_page",
   "background_page": "background.html",
+  "manifest_version": 2,
   "version": "0.1"
 }
\ No newline at end of file

chrome/test/data/extensions/context_menus/frames/manifest.json

 {
   "name" : "Context Menus Test Extension",
   "version" : "0.1",
+  "manifest_version": 2,
   "permissions": [ "contextMenus", "tabs" ],
   "background_page": "background.html"
 }

chrome/test/data/extensions/context_menus/incognito/manifest.json

 {
   "name": "Tests that context menus work properly in incognito split mode",
   "version": "0.1",
+  "manifest_version": 2,
   "permissions": ["contextMenus"],
   "incognito": "split",
   "background_page": "background.html"

chrome/test/data/extensions/context_menus/long_title/manifest.json

 {
   "name" : "Context Menus Test Extension",
   "version" : "0.1",
+  "manifest_version": 2,
   "permissions": [ "contextMenus", "tabs" ],
   "background_page": "background.html"
 }

chrome/test/data/extensions/context_menus/patterns/manifest.json

 {
   "name": "Tests for the url patterns to restrict context menu items.",
   "version": "0.1",
+  "manifest_version": 2,
   "permissions": ["contextMenus", "tabs"],
   "background_page": "background.html"
 }

chrome/test/data/extensions/context_menus/separators/manifest.json

 {
   "name": "Separators Test",
   "version": "0.1",
+  "manifest_version": 2,
   "description": "Tests for separators added both explicitly via the API and automatically at display time to group radio items together.",
   "permissions": ["contextMenus"]
 }

chrome/test/data/extensions/context_menus/simple/manifest.json

 {
   "name" : "Context Menus Test Extension",
   "version" : "0.1",
+  "manifest_version": 2,
   "permissions": [ "contextMenus", "tabs" ],
   "background_page": "background.html"
 }

chrome/test/data/extensions/context_menus/target_urls/manifest.json

 {
   "name" : "targetUrlPatterns test",
   "version" : "0.1",
+  "manifest_version": 2,
   "permissions": [ "contextMenus", "tabs" ],
   "background_page": "background.html"
 }

chrome/test/data/extensions/devtools/timeline_api/background.html

-<script>
-
-var receivedEvents = [];
-var devtoolsTabEvents = undefined;
-
-function pageEventListener() {
-  receivedEvents.push("onPageEvent");
-}
-
-function tabCloseListener() {
-  receivedEvents.push("onTabClose");
-}
-
-function setListenersOnTab(tabId) {
-  try {
-    devtoolsTabEvents = chrome.devtools.getTabEvents(tabId);
-    devtoolsTabEvents.onPageEvent.addListener(pageEventListener);
-    devtoolsTabEvents.onTabClose.addListener(tabCloseListener);
-    window.domAutomationController.send(true);
-  } catch(e) {
-    window.domAutomationController.send(false);
-  }
-}
-
-function testReceivePageEvent() {
-  if (receivedEvents.length == 1) {
-    var eventName = receivedEvents.pop();
-    window.domAutomationController.send(eventName === "onPageEvent");
-  } else {
-    receivedEvents = [];
-    window.domAutomationController.send(false);
-  }
-}
-
-function testReceiveTabCloseEvent() {
-  if (receivedEvents.length == 1) {
-    var eventName = receivedEvents.pop();
-    window.domAutomationController.send(eventName === "onTabClose");
-  } else {
-    receivedEvents = [];
-    window.domAutomationController.send(false);
-  }
-}
-
-function unregisterListeners() {
-  devtoolsTabEvents.onPageEvent.removeListener(pageEventListener);
-  devtoolsTabEvents.onTabClose.removeListener(tabCloseListener);
-  window.domAutomationController.send(true);
-}
-
-</script>
+<!--
+ * Copyright (c) 2011 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.
+-->
+<script src="background.js"></script>

chrome/test/data/extensions/devtools/timeline_api/background.js

+// Copyright (c) 2011 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.
+
+var receivedEvents = [];
+var devtoolsTabEvents = undefined;
+
+function pageEventListener() {
+  receivedEvents.push("onPageEvent");
+}
+
+function tabCloseListener() {
+  receivedEvents.push("onTabClose");
+}
+
+function setListenersOnTab(tabId) {
+  try {
+    devtoolsTabEvents = chrome.devtools.getTabEvents(tabId);
+    devtoolsTabEvents.onPageEvent.addListener(pageEventListener);
+    devtoolsTabEvents.onTabClose.addListener(tabCloseListener);
+    window.domAutomationController.send(true);
+  } catch(e) {
+    window.domAutomationController.send(false);
+  }
+}
+
+function testReceivePageEvent() {
+  if (receivedEvents.length == 1) {
+    var eventName = receivedEvents.pop();
+    window.domAutomationController.send(eventName === "onPageEvent");
+  } else {
+    receivedEvents = [];
+    window.domAutomationController.send(false);
+  }
+}
+
+function testReceiveTabCloseEvent() {
+  if (receivedEvents.length == 1) {
+    var eventName = receivedEvents.pop();
+    window.domAutomationController.send(eventName === "onTabClose");
+  } else {
+    receivedEvents = [];
+    window.domAutomationController.send(false);
+  }
+}
+
+function unregisterListeners() {
+  devtoolsTabEvents.onPageEvent.removeListener(pageEventListener);
+  devtoolsTabEvents.onTabClose.removeListener(tabCloseListener);
+  window.domAutomationController.send(true);
+}

chrome/test/data/extensions/devtools/timeline_api/manifest.json

 {
   "name": "DevTools test",
   "version": "0.1",
+  "manifest_version": 2,
   "description": "",
   "background_page": "background.html",
   "permissions": [ "tabs" ]

chrome/test/data/extensions/devtools/timeline_api_two/background_two.html

-<script>
-
-var devtoolsTabEvents = undefined;
-
-function pageEventListener() {
-  receivedEvents.push("onPageEvent");
-}
-
-function tabCloseListener() {
-  receivedEvents.push("onTabClose");
-}
-
-function registerListenersForTab(tabId) {
-  devtoolsTabEvents = chrome.devtools.getTabEvents(tabId);
-  devtoolsTabEvents.onPageEvent.addListener(pageEventListener);
-  devtoolsTabEvents.onTabClose.addListener(tabCloseListener);
-  window.domAutomationController.send(true);
-}
-
-function unregisterListeners() {
-  devtoolsTabEvents.onPageEvent.removeListener(pageEventListener);
-  devtoolsTabEvents.onTabClose.removeListener(tabCloseListener);
-  window.domAutomationController.send(true);
-}
-
-</script>
+<!--
+ * Copyright (c) 2011 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.
+-->
+<script src="background_two.js"></script>

chrome/test/data/extensions/devtools/timeline_api_two/background_two.js

+// Copyright (c) 2011 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.
+
+var devtoolsTabEvents = undefined;
+
+function pageEventListener() {
+  receivedEvents.push("onPageEvent");
+}
+
+function tabCloseListener() {
+  receivedEvents.push("onTabClose");
+}
+
+function registerListenersForTab(tabId) {
+  devtoolsTabEvents = chrome.devtools.getTabEvents(tabId);
+  devtoolsTabEvents.onPageEvent.addListener(pageEventListener);
+  devtoolsTabEvents.onTabClose.addListener(tabCloseListener);
+  window.domAutomationController.send(true);
+}
+
+function unregisterListeners() {
+  devtoolsTabEvents.onPageEvent.removeListener(pageEventListener);
+  devtoolsTabEvents.onTabClose.removeListener(tabCloseListener);
+  window.domAutomationController.send(true);
+}

chrome/test/data/extensions/devtools/timeline_api_two/manifest.json

 {
   "name": "DevTools test (two)",
   "version": "0.1",
+  "manifest_version": 2,
   "description": "",
   "background_page": "background_two.html"
 }

chrome/test/data/extensions/effective_host_permissions/all_hosts.json

 {
   "name": "effective host permisions test",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://*/"
   ]

chrome/test/data/extensions/effective_host_permissions/all_hosts2.json

 {
   "name": "effective host permisions test",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://*/",
     "http://www.google.com/"

chrome/test/data/extensions/effective_host_permissions/all_hosts3.json

 {
   "name": "effective host permisions test",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://www.google.com/"
   ],

chrome/test/data/extensions/effective_host_permissions/empty.json

 {
   "name": "effective host permisions test",
+  "manifest_version": 2,
   "version": "1.0"
 }

chrome/test/data/extensions/effective_host_permissions/https_not_considered.json

 {
   "name": "effective host permisions test",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://*.google.com/",
     "http://google.com/",

chrome/test/data/extensions/effective_host_permissions/one_host.json

 {
   "name": "effective host permisions test",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://www.google.com/"
   ]

chrome/test/data/extensions/effective_host_permissions/one_host_wildcard.json

 {
   "name": "effective host permisions test",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://*.google.com/"
   ]

chrome/test/data/extensions/effective_host_permissions/two_content_scripts.json

 {
   "name": "effective host permisions test",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://*.google.com/",
     "http://google.com/",

chrome/test/data/extensions/effective_host_permissions/two_hosts.json

 {
   "name": "effective host permisions test",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "http://www.google.com/",
     "http://www.reddit.com/"

chrome/test/data/extensions/empty_manifest/empty.json

 {
   "name": "A generic empty manifest to use for testing",
+  "manifest_version": 2,
   "version": "1.0"
 }

chrome/test/data/extensions/hosted_app/manifest.json

 {
   "name": "hosted_app",
   "version": "0.1",
+  "manifest_version": 2,
   "description": "Trivial hosted app.",
   "app": {
     "urls": [

chrome/test/data/extensions/icon_size_test/manifest.json

 {
   "name": "A browser action with a large icon",
   "version": "1.0",
+  "manifest_version": 2,
   "permissions": [
     "tabs", "http://*/*"
   ],

chrome/test/data/extensions/image_loading_tracker/app.json

 {
   "name": "test",
   "version": "1",
+  "manifest_version": 2,
   "icons": { "16": "16.png",
              "24": "24.png" }
 }

chrome/test/data/extensions/install_prompt/extension.json

 {
   "name": "test",
+  "manifest_version": 2,
   "version": "1"
 }

chrome/test/data/extensions/isolated_apps/app1/manifest.json

 {
   "name": "isolated_app1",
   "version": "0.1",
+  "manifest_version": 2,
   "description": "Tests isolation of stored data for apps.",
   "app": {
     "urls": [

chrome/test/data/extensions/isolated_apps/app2/manifest.json

 {
   "name": "isolated_app2",
   "version": "0.1",
+  "manifest_version": 2,
   "description": "Tests isolation of stored data for apps.",
   "app": {
     "urls": [

chrome/test/data/extensions/js_injection_background/bg.html

+<!--
+ * Copyright (c) 2011 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.
+-->
 <html>
-  <script>
-    var bool_var = true;
-    var int_var = 42;
-    var str_var = "foo";
-  </script>
+  <script src="bg.js"></script>
   <body>
     <input id="myinput"></input>
   </body>

chrome/test/data/extensions/js_injection_background/bg.js

+// Copyright (c) 2011 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.
+
+var bool_var = true;
+var int_var = 42;
+var str_var = "foo";

chrome/test/data/extensions/js_injection_background/manifest.json

@@ -3,6 +3,7 @@
   "description": "Tests JS injection into an extension's background page.
     The name of a DOM node in the background page is returned and verified.",
   "version": "0.1",
+  "manifest_version": 2,
   "background_page": "bg.html",
   "browser_action": {
     "default_title": "Browser Action"