Remove extension automation support that was used only by CEEE.

chrome_frame/chrome_frame_npapi.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
 #include "chrome_frame/chrome_frame_npapi.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
@@ skipping 36 matching lines @@
 const NPUTF8* ChromeFrameNPAPI::plugin_property_identifier_names_[] = {
   "version",
   "src",
   "onload",
   "onloaderror",
   "onmessage",
   "readystate",
   "onprivatemessage",
   "usechromenetwork",
   "onclose",
-  "sessionid",
 };
 
 const NPUTF8* ChromeFrameNPAPI::plugin_method_identifier_names_[] = {
   "postMessage",
   "postPrivateMessage",
-  "installExtension",
-  "loadExtension",
-  "enableExtensionAutomation",
-  "getEnabledExtensions"
 };
 
 ChromeFrameNPAPI::PluginMethod ChromeFrameNPAPI::plugin_methods_[] = {
   &ChromeFrameNPAPI::postMessage,
   &ChromeFrameNPAPI::postPrivateMessage,
-  &ChromeFrameNPAPI::installExtension,
-  &ChromeFrameNPAPI::loadExtension,
-  &ChromeFrameNPAPI::enableExtensionAutomation,
-  &ChromeFrameNPAPI::getEnabledExtensions,
 };
 
 NPIdentifier
     ChromeFrameNPAPI::plugin_method_identifiers_[arraysize(plugin_methods_)]
         = {0};
 
 
 void ChromeFrameNPAPI::CompileAsserts() {
   NOTREACHED();  // This function should never be invoked.
 
@@ skipping 18 matching lines @@
 // When the privileged_mode property is provided and set to true, the control
 // will probe for whether its hosting document has the system principal, in
 // which case privileged mode will be enabled.
 static const char kPluginPrivilegedModeAttribute[] = "privileged_mode";
 // If privileged mode is enabled, the string value of this argument will
 // be appended to the chrome.exe command line.
 static const char kPluginChromeExtraArguments[] = "chrome_extra_arguments";
 // If privileged mode is enabled, the string value of this argument will
 // be used as the profile name for our chrome.exe instance.
 static const char kPluginChromeProfileName[] = "chrome_profile_name";
-// If privileged mode is enabled, this argument will be taken as a
-// comma-separated list of API function calls to automate.
-static const char kPluginChromeFunctionsAutomatedAttribute[] =
-    "chrome_functions_automated";
 // If chrome network stack is to be used
 static const char kPluginUseChromeNetwork[] = "usechromenetwork";
 
 // ChromeFrameNPAPI member defines.
 
 // TODO(tommi): remove ignore_setfocus_ since that's not how focus is
 //  handled anymore.
 
 ChromeFrameNPAPI::ChromeFrameNPAPI()
     : instance_(NULL),
@@ skipping 79 matching lines @@
       // Test for the FireFox privileged mode if the user requests it
       // in initialization parameters.
       wants_privileged = atoi(argv[i]) ? true : false;
     } else if (LowerCaseEqualsASCII(argn[i],
                                     kPluginOnPrivateMessageAttribute)) {
       onprivatemessage_arg = argv[i];
     } else if (LowerCaseEqualsASCII(argn[i], kPluginChromeExtraArguments)) {
       chrome_extra_arguments_arg = argv[i];
     } else if (LowerCaseEqualsASCII(argn[i], kPluginChromeProfileName)) {
       chrome_profile_name_arg = argv[i];
-    } else if (LowerCaseEqualsASCII(argn[i],
-                                    kPluginChromeFunctionsAutomatedAttribute)) {
-      functions_enabled_.clear();
-      // base::SplitString writes one empty entry for blank strings, so we need
-      // this to allow specifying zero automation of API functions.
-      if (argv[i][0] != '\0')
-        base::SplitString(argv[i], ',', &functions_enabled_);
     } else if (LowerCaseEqualsASCII(argn[i], kPluginUseChromeNetwork)) {
       chrome_network_arg_set = true;
       chrome_network_arg = atoi(argv[i]) ? true : false;
     }
   }
 
   // Is the privileged mode requested?
   if (wants_privileged) {
     set_is_privileged(IsFireFoxPrivilegedInvocation(instance));
     if (!is_privileged()) {
@@ skipping 424 matching lines @@
         automation_client_->GetVersion();
     AllocateStringVariant(WideToUTF8(version), variant);
     return true;
   } else if (name == plugin_property_identifiers_[PLUGIN_PROPERTY_READYSTATE]) {
     INT32_TO_NPVARIANT(ready_state_, *variant);
     return true;
   } else if (name ==
         plugin_property_identifiers_[PLUGIN_PROPERTY_USECHROMENETWORK]) {
     BOOLEAN_TO_NPVARIANT(automation_client_->use_chrome_network(), *variant);
     return true;
-  } else if (name == plugin_property_identifiers_[PLUGIN_PROPERTY_SESSIONID]) {
-    if (!is_privileged()) {
-      DLOG(WARNING) << "Attempt to read sessionid property while not "
-                       "privileged";
-    } else {
-      INT32_TO_NPVARIANT(automation_client_->GetSessionId(), *variant);
-      return true;
-    }
   }
 
   return false;
 }
 
 bool ChromeFrameNPAPI::GetProperty(NPObject* object, NPIdentifier name,
                                    NPVariant* variant) {
   if (!object || !variant) {
     NOTREACHED();
     return false;
@@ skipping 544 matching lines @@
   const NPString& target_str = args[2].value.stringValue;
   std::string message(message_str.UTF8Characters, message_str.UTF8Length);
   std::string origin(origin_str.UTF8Characters, origin_str.UTF8Length);
   std::string target(target_str.UTF8Characters, target_str.UTF8Length);
 
   automation_client_->ForwardMessageFromExternalHost(message, origin, target);
 
   return true;
 }
 
-bool ChromeFrameNPAPI::installExtension(NPObject* npobject,
-                                        const NPVariant* args,
-                                        uint32_t arg_count,
-                                        NPVariant* result) {
-  if (arg_count > 2 || !NPVARIANT_IS_STRING(args[0]) ||
-      (arg_count == 2 && !NPVARIANT_IS_OBJECT(args[1]))) {
-    NOTREACHED();
-    return false;
-  }
-
-  if (!is_privileged()) {
-    DLOG(WARNING) << "installExtension invoked in non-privileged mode";
-    return false;
-  }
-
-  if (!automation_client_.get()) {
-    DLOG(WARNING) << "installExtension invoked with no automaton client";
-    NOTREACHED();
-    return false;
-  }
-
-  const NPString& crx_path_str = args[0].value.stringValue;
-  std::string crx_path_a(crx_path_str.UTF8Characters, crx_path_str.UTF8Length);
-  FilePath::StringType crx_path_u(UTF8ToWide(crx_path_a));
-  FilePath crx_path(crx_path_u);
-  NPObject* retained_function = npapi::RetainObject(args[1].value.objectValue);
-
-  automation_client_->InstallExtension(crx_path, retained_function);
-  // The response to this command will be returned in the OnExtensionInstalled
-  // delegate callback function.
-
-  return true;
-}
-
-void ChromeFrameNPAPI::OnExtensionInstalled(
-    const FilePath& path,
-    void* user_data,
-    AutomationMsg_ExtensionResponseValues res) {
-  ScopedNpVariant result;
-  NPVariant param;
-  INT32_TO_NPVARIANT(res, param);
-  NPObject* func = reinterpret_cast<NPObject*>(user_data);
-
-  InvokeDefault(func, param, &result);
-  npapi::ReleaseObject(func);
-}
-
-bool ChromeFrameNPAPI::loadExtension(NPObject* npobject,
-                                     const NPVariant* args,
-                                     uint32_t arg_count,
-                                     NPVariant* result) {
-  if (arg_count > 2 || !NPVARIANT_IS_STRING(args[0]) ||
-      (arg_count == 2 && !NPVARIANT_IS_OBJECT(args[1]))) {
-    NOTREACHED();
-    return false;
-  }
-
-  if (!is_privileged()) {
-    DLOG(WARNING) << "loadExtension invoked in non-privileged mode";
-    return false;
-  }
-
-  if (!automation_client_.get()) {
-    DLOG(WARNING) << "loadExtension invoked with no automaton client";
-    NOTREACHED();
-    return false;
-  }
-
-  const NPString& path_str = args[0].value.stringValue;
-  std::string path_a(path_str.UTF8Characters, path_str.UTF8Length);
-  FilePath::StringType path_u(UTF8ToWide(path_a));
-  FilePath path(path_u);
-  NPObject* retained_function = npapi::RetainObject(args[1].value.objectValue);
-
-  automation_client_->LoadExpandedExtension(path, retained_function);
-  // The response to this command will be returned in the OnExtensionInstalled
-  // delegate callback function.
-
-  return true;
-}
-
-bool ChromeFrameNPAPI::enableExtensionAutomation(NPObject* npobject,
-                                                 const NPVariant* args,
-                                                 uint32_t arg_count,
-                                                 NPVariant* result) {
-  if (arg_count > 1 || (arg_count == 1 && !NPVARIANT_IS_STRING(args[0]))) {
-    NOTREACHED();
-    return false;
-  }
-
-  if (!is_privileged()) {
-    DLOG(WARNING) <<
-        "enableExtensionAutomation invoked in non-privileged mode";
-    return false;
-  }
-
-  if (!automation_client_.get()) {
-    DLOG(WARNING) <<
-        "enableExtensionAutomation invoked with no automaton client";
-    NOTREACHED();
-    return false;
-  }
-
-  if (!automation_client_->tab()) {
-    DLOG(WARNING) << "enableExtensionAutomation invoked with no hosted tab";
-    NOTREACHED();
-    return false;
-  }
-
-  // Empty by default e.g. if no arguments passed.
-  std::vector<std::string> functions;
-
-  if (arg_count == 1) {
-    const NPString& functions_str = args[0].value.stringValue;
-    std::string functions_a(functions_str.UTF8Characters,
-                            functions_str.UTF8Length);
-
-    // base::SplitString writes one empty entry for blank strings, so we need
-    // this to allow specifying zero automation of API functions.
-    if (functions_a[0] != '\0')
-      base::SplitString(functions_a, ',', &functions);
-  }
-
-  automation_client_->tab()->SetEnableExtensionAutomation(functions);
-  // This function returns no result.
-
-  return true;
-}
-
-bool ChromeFrameNPAPI::getEnabledExtensions(NPObject* npobject,
-                                            const NPVariant* args,
-                                            uint32_t arg_count,
-                                            NPVariant* result) {
-  if (arg_count > 1 || !NPVARIANT_IS_OBJECT(args[0])) {
-    NOTREACHED();
-    return false;
-  }
-
-  if (!is_privileged()) {
-    DLOG(WARNING) << "getEnabledExtensions invoked in non-privileged mode";
-    return false;
-  }
-
-  if (!automation_client_.get()) {
-    DLOG(WARNING) << "getEnabledExtensions invoked with no automaton client";
-    NOTREACHED();
-    return false;
-  }
-
-  NPObject* retained_function = npapi::RetainObject(args[0].value.objectValue);
-
-  automation_client_->GetEnabledExtensions(retained_function);
-  // The response to this command will be returned in the
-  // OnGetEnabledExtensionsCompleted delegate callback function.
-
-  return true;
-}
-
-void ChromeFrameNPAPI::OnGetEnabledExtensionsComplete(
-    void* user_data,
-    const std::vector<FilePath>& extension_directories) {
-  std::vector<std::wstring> extension_paths;
-  for (size_t i = 0; i < extension_directories.size(); ++i) {
-    extension_paths.push_back(extension_directories[i].value());
-  }
-  std::wstring tab_delimited = JoinString(extension_paths, L'\t');
-
-  std::string res = WideToUTF8(tab_delimited);
-
-  ScopedNpVariant result;
-  NPVariant param;
-  STRINGN_TO_NPVARIANT(res.c_str(), res.length(), param);
-
-  NPObject* func = reinterpret_cast<NPObject*>(user_data);
-  InvokeDefault(func, param, &result);
-  npapi::ReleaseObject(func);
-}
-
 void ChromeFrameNPAPI::FireEvent(const std::string& event_type,
                                  const std::string& data) {
   NPVariant arg;
   STRINGN_TO_NPVARIANT(data.c_str(), data.length(), arg);
   FireEvent(event_type, arg);
 }
 
 void ChromeFrameNPAPI::FireEvent(const std::string& event_type,
                                  const NPVariant& data) {
   // Check that we're not bundling an event inside an event.
@@ skipping 84 matching lines @@
 void ChromeFrameNPAPI::URLRedirectNotify(const char* url, int status,
                                          void* notify_data) {
   DVLOG(1) << __FUNCTION__
            << "Received redirect notification for url:"
            << url;
   // Inform chrome about the redirect and disallow the current redirect
   // attempt.
   url_fetcher_.UrlRedirectNotify(url, status, notify_data);
   npapi::URLRedirectResponse(instance_, notify_data, false);
 }
-