Merge 162026 - White-list the two ssh client webstore ids besides quickoffice.

chrome/renderer/chrome_content_renderer_client.cc

 // Copyright (c) 2012 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/chrome_content_renderer_client.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 568 matching lines @@
       for (size_t i = 0; i < content_type.additional_param_names.size(); ++i) {
         if (content_type.additional_param_names[i] == nacl_attr)
           return GURL(content_type.additional_param_values[i]);
       }
       break;
     }
   }
   return GURL();
 }
 
+// TODO(dschuff): remove this when ARM ABI is stable
+#if defined(__arm__) && defined(OS_CHROMEOS)
+static bool IsWhiteListedARM(const GURL& url) {
+  return
+    // QuickOffice
+    url.host() == "gbkeegbaiigmenfmjfclcdgdpimamgkj" ||
+    // ssh dev
+    url.host() == "okddffdblfhhnmhodogpojmfkjmhinfp" ||
+    // ssh stable
+    url.host() == "pnhechapfaindjhompbnflcldabbghjo";
+}
+#endif
+
 //  static
 bool ChromeContentRendererClient::IsNaClAllowed(
     const GURL& manifest_url,
     const GURL& top_url,
     bool is_nacl_unrestricted,
     bool is_extension_unrestricted,
     bool is_extension_from_webstore,
     WebPluginParams* params) {
   // Temporarily allow these URLs to run NaCl apps. We should remove this
   // code when PNaCl ships.
   bool is_whitelisted_url =
       ((top_url.SchemeIs("http") || top_url.SchemeIs("https")) &&
       (top_url.host() == "plus.google.com" ||
           top_url.host() == "plus.sandbox.google.com") &&
       top_url.path().find("/games") == 0);
 
   // Allow Chrome Web Store extensions, built-in extensions, extensions
   // under development, invocations from whitelisted URLs, and all invocations
   // if --enable-nacl is set.
   bool is_nacl_allowed =
-#if defined(__arm__)
+#if defined(__arm__) && defined(OS_CHROMEOS)
     // The ARM ABI is not quite stable, so only allow NaCl for
     // unrestricted extensions (i.e. built-in and under development),
-    // and for the QuickOffice webstore app.
+    // and for certain whitelisted webstore apps.
     // See http://crbug.com/145694
     // TODO(dschuff): remove this when the ABI is stable
     (is_extension_from_webstore &&
      manifest_url.SchemeIs("chrome-extension") &&
-     manifest_url.host() == "gbkeegbaiigmenfmjfclcdgdpimamgkj") ||
+     IsWhiteListedARM(manifest_url) ||
 #else
     is_extension_from_webstore ||
     is_whitelisted_url ||
 #endif
     is_extension_unrestricted ||
     is_nacl_unrestricted;
   if (is_nacl_allowed) {
     bool app_can_use_dev_interfaces =
         // NaCl PDF viewer extension
         (is_extension_from_webstore &&
@@ skipping 335 matching lines @@
 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
   return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
 }
 
 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
     webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
   factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
 }
 
 }  // namespace chrome