Remove the NaCl PPAPI proxy lab.

The IPC proxy is now the default. The SRPC proxy can still be run locally and
in tests with the --enable-nacl-srpc-proxy command line flag.
BUG=154443
TEST=manual

Review URL: https://chromiumcodereview.appspot.com/11801039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175950 0039d316-1c4b-4281-b951-d872f2087c98

chrome/app/generated_resources.grd

@@ -6117,12 +6117,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_ENABLE_PNACL_DESCRIPTION" desc="Description of the 'Enable Portable Native Client' lab.">
         Enable support for Portable Native Client.
       </message>
-      <message name="IDS_FLAGS_ENABLE_NACL_SRPC_PROXY_NAME" desc="Name of the 'Enable Native Client SRPC Proxy' lab.">
-        Native Client SRPC Proxy.
-      </message>
-      <message name="IDS_FLAGS_ENABLE_NACL_SRPC_PROXY_DESCRIPTION" desc="Description of the 'Enable Native Client SRPC Proxy' lab.">
-        Use NaCl SRPC, rather than Chrome IPC, to proxy Pepper calls between Chrome and the plugin.
-      </message>
       <message name="IDS_FLAGS_DOWNLOADS_NEW_UI_NAME" desc="Name of the 'New Downloads UI' lab.">
         New Downloads UI
       </message>
@@ -9323,7 +9317,7 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
       <if expr="pp_ifdef('android') or pp_ifdef('ios')">
         <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG" desc="When a webpage fails to load, in some cases we suggest checking the proxy server configuration, or disabling the proxy server.">
           If you use a proxy server, check your proxy settings or contact your
-          network administrator to make sure the proxy server is working. 
+          network administrator to make sure the proxy server is working.
         </message>
       </if>
       <if expr="not pp_ifdef('android') and not pp_ifdef('ios')">

chrome/browser/about_flags.cc

@@ -430,15 +430,6 @@ const Experiment kExperiments[] = {
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kEnablePnacl)
   },
-  // TODO(bbudge): When NaCl switches to the IPC-based proxy, remove this
-  // flag entry.
-  {
-    "enable-nacl-srpc-proxy",  // FLAGS:RECORD_UMA
-    IDS_FLAGS_ENABLE_NACL_SRPC_PROXY_NAME,
-    IDS_FLAGS_ENABLE_NACL_SRPC_PROXY_DESCRIPTION,
-    kOsAll,
-    SINGLE_VALUE_TYPE(switches::kEnableNaClSRPCProxy)
-  },
   {
     "extension-apis",  // FLAGS:RECORD_UMA
     IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME,

chrome/tools/chromeactions.txt

@@ -17,7 +17,6 @@
 0x4eae5ccc2900dffa	AboutFlags_enable-nacl
 0x91d89fbc43b29963	AboutFlags_enable-nacl-debug
 0x6d932203ed5c6ae8	AboutFlags_enable-nacl-exception-handling
-0xa4ed571713f9e346	AboutFlags_enable-nacl-ipc-proxy
 0x26ca6c633d183f66	AboutFlags_enable-pnacl
 0x1a3d598e2cd416a0	AboutFlags_enable-smooth-scrolling
 0x22268494c966e464	AboutFlags_enable-website-settings