Add frameId to chrome.tabs.executeScript/insertCSS

chrome/test/data/extensions/api_test/executescript/basic/test.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 pass = chrome.test.callbackPass;
 var fail = chrome.test.callbackFail;
 var assertEq = chrome.test.assertEq;
 var assertTrue = chrome.test.assertTrue;
 var relativePath =
     '/extensions/api_test/executescript/basic/test_executescript.html';
@@ skipping 70 matching lines @@
               {code: 'document.title = document.styleSheets.length'},
               function() {
                 chrome.tabs.get(tabId, pass(function(tab) {
                   assertEq('0', tab.title);
                 }));
              });
         });
       },
 
       function executeJavaScriptCodeShouldFail() {
-        chrome.tabs.update(tabId, { url: testFailureUrl }, function() {
+        var doneListening =

[Devlin, 2016/01/26 20:40:36]

What's the reason for this change?

[robwu, 2016/01/26 23:57:58]

Otherwise the test would fail, because chrome.tabs.executeScript now uses the
last committed URL for determining script injection, instead of the visible URL.
Calling chrome.tabs.update immediately changes the visible URL, but not the last
committed URL.

[Devlin, 2016/01/27 18:33:48]

Heh.  That's the right choice, but I'm sure this is gonna bite us some day...

+            chrome.test.listenForever(chrome.tabs.onUpdated, onUpdated);
+        chrome.tabs.update(tabId, {url: testFailureUrl});
+
+        function onUpdated(updatedTabId, changeInfo) {
+          if (updatedTabId !== tabId || changeInfo.url === testFailureUrl)
+            return;
           var script_file = {};
           script_file.code = "document.title = 'executeScript';";
           // The error message should contain the URL of the site for which it
           // failed because the extension has the tabs permission.
           chrome.tabs.executeScript(tabId, script_file, fail(
               'Cannot access contents of url "' + testFailureUrl +
               '". Extension manifest must request permission to access this ' +
               'host.'));
-        });
+          doneListening();
+        }
       },
 
       function executeJavaScriptWithNoneValueShouldFail() {
         var script_file = {};
         chrome.tabs.executeScript(tabId, script_file, fail(
             'No source code or file specified.'));
       },
 
       function executeJavaScriptWithTwoValuesShouldFail() {
         var script_file = {};
         script_file.file = 'script1.js';
         script_file.code = 'var test = 1;';
         chrome.tabs.executeScript(tabId, script_file, fail(
             'Code and file should not be specified ' +
             'at the same time in the second argument.'));
       }
     ]);
   });
 
   chrome.tabs.create({ url: testUrl });
 });