Make a bunch of backlogged breaking changes to the extensions

chrome/test/data/extensions/samples/benchmark/toolstrip.html

 <style>
 #options {
   position: absolute;
   background-color: #FFFFCC;
   display: none;
   font-family: "Courier New";
   font-size: 9pt;
   padding: 5px;
   border: 1px solid #CCCC88;
   z-index: 3;
@@ skipping 154 matching lines @@
       me_.finish();
     }
 
     // Update the UI
     me_.displayResults();
   }
 }
 
 var benchmarks = new Array();
 
-chrome.self.onConnect.addListener(function(port) {
+chrome.extension.onConnect.addListener(function(port) {
   port.onMessage.addListener(function(data) {
     if (data.message == "load") {
       var benchmark = benchmarks[data.url];
       if (benchmark != undefined && benchmark.isRunning()) {
         benchmark.pageFinished(data.values);
       }
     }
   });
 });
 
@@ skipping 18 matching lines @@
   color: green;
   text-align: center;
   vertical-align: center;
 }
 </style>
 
 <div id="bench">
 <img src="stopwatch.jpg" height="25" width="25" align=top onclick="show_options()">
 <span id="result"></span>
 </div>