Implement chrome.extension.connectExternal and fix various API inconsistencies.

chrome/renderer/user_script_slave.cc

 // Copyright (c) 2009 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/renderer/user_script_slave.h"
 
 #include "app/resource_bundle.h"
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/perftimer.h"
 #include "base/pickle.h"
 #include "base/shared_memory.h"
 #include "base/string_util.h"
 #include "chrome/renderer/extension_groups.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/api/public/WebFrame.h"
 
 #include "grit/renderer_resources.h"
 
 using WebKit::WebFrame;
 using WebKit::WebString;
 
 // These two strings are injected before and after the Greasemonkey API and
 // user script to wrap it in an anonymous scope.
 static const char kUserScriptHead[] = "(function (unsafeWindow) {\n";
 static const char kUserScriptTail[] = "\n})(window);";
 
-// Creates a convenient reference to a content script's parent extension.
-// TODO(mpcomplete): self.onConnect is deprecated.  Remove it at 1.0.
-// http://code.google.com/p/chromium/issues/detail?id=16356
-static const char kInitExtension[] =
-    "chrome.extension = new chrome.Extension('%s');"
-    "chrome.self.onConnect = chrome.extension.onConnect;";
+// Sets up the chrome.extension module.
+static const char kInitExtension[] = "chrome.initExtension('%s');";
 
 int UserScriptSlave::GetIsolatedWorldId(const std::string& extension_id) {
   typedef std::map<std::string, int> IsolatedWorldMap;
 
   static IsolatedWorldMap g_isolated_world_ids;
   static int g_next_isolated_world_id = 1;
 
   IsolatedWorldMap::iterator iter = g_isolated_world_ids.find(extension_id);
   if (iter != g_isolated_world_ids.end())
     return iter->second;
@@ skipping 160 matching lines @@
     UMA_HISTOGRAM_TIMES("Extensions.InjectStart_Time", timer.Elapsed());
   } else {
     UMA_HISTOGRAM_COUNTS_100("Extensions.InjectEnd_ScriptCount", num_scripts);
     UMA_HISTOGRAM_TIMES("Extensions.InjectEnd_Time", timer.Elapsed());
   }
 
   LOG(INFO) << "Injected " << num_scripts << " scripts and " << num_css <<
       "css files into " << frame->url().spec().data();
   return true;
 }