Revert 90805 - I am submitting this with LGTMs from agl@ and evanm@. I'm marking this as TBR=jam@...

content/common/content_switches.h

 // 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.
 
 // Defines all the "content" command-line switches.
 
 #ifndef CONTENT_COMMON_CONTENT_SWITCHES_H_
 #define CONTENT_COMMON_CONTENT_SWITCHES_H_
 #pragma once
 
@@ skipping 74 matching lines @@
 extern const char kInProcessPlugins[];
 extern const char kInProcessWebGL[];
 extern const char kJavaScriptFlags[];
 extern const char kLevelDBIndexedDatabase[];
 extern const char kLoadPlugin[];
 extern const char kLoggingLevel[];
 extern const char kLogPluginMessages[];
 // TODO(jam): this doesn't belong in content.
 extern const char kNaClBrokerProcess[];
 extern const char kNaClLoaderProcess[];
-// TODO(bradchen): remove kNaClLinuxHelper switch.
-// This switch enables the experimental lightweight nacl_helper for Linux.
-// It will be going away soon, when the helper is enabled permanently.
-extern const char kNaClLinuxHelper[];
 extern const char kNoDisplayingInsecureContent[];
 extern const char kNoJsRandomness[];
 extern const char kNoReferrers[];
 extern const char kNoSandbox[];
 extern const char kPlaybackMode[];
 extern const char kPluginLauncher[];
 extern const char kPluginPath[];
 extern const char kPluginProcess[];
 extern const char kPluginStartupDialog[];
 extern const char kPpapiBrokerProcess[];
@@ skipping 45 matching lines @@
 extern const char kEnableP2PApi[];
 #endif
 
 #if !defined(OFFICIAL_BUILD)
 extern const char kRendererCheckFalseTest[];
 #endif
 
 }  // namespace switches
 
 #endif  // CONTENT_COMMON_CONTENT_SWITCHES_H_