Remove disable-pnacl-install flag.

This was added a while back to be able to quickly turn off
component downloads for PNaCl if it got out of hand (via
flipping the flag).

It doesn't seem so necessary anymore, so remove it as part
of the chrome flags cleanup effort.


BUG=357762

Review URL: https://codereview.chromium.org/398213002

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

chrome/browser/chrome_browser_main.cc

@@ -380,7 +380,7 @@ OSStatus KeychainCallback(SecKeychainEvent keychain_event,
 }
 #endif
 
-void RegisterComponentsForUpdate(const CommandLine& command_line) {
+void RegisterComponentsForUpdate() {
   component_updater::ComponentUpdateService* cus =
       g_browser_process->component_updater();
 
@@ -391,8 +391,7 @@ void RegisterComponentsForUpdate(const CommandLine& command_line) {
   RegisterRecoveryComponent(cus, g_browser_process->local_state());
   RegisterPepperFlashComponent(cus);
   RegisterSwiftShaderComponent(cus);
-  g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(
-      cus, command_line);
+  g_browser_process->pnacl_component_installer()->RegisterPnaclComponent(cus);
   RegisterWidevineCdmComponent(cus);
 #endif
 
@@ -1445,7 +1444,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   browser_process_->notification_ui_manager();
 
   if (!parsed_command_line().HasSwitch(switches::kDisableComponentUpdate))
-    RegisterComponentsForUpdate(parsed_command_line());
+    RegisterComponentsForUpdate();
 
 #if defined(OS_ANDROID)
   chrome_variations::VariationsService* variations_service =

chrome/browser/component_updater/pnacl/pnacl_component_installer.cc

@@ -11,7 +11,6 @@
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/callback.h"
-#include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
@@ -203,8 +202,7 @@ bool CheckPnaclComponentManifest(const base::DictionaryValue& manifest,
 
 }  // namespace
 
-PnaclComponentInstaller::PnaclComponentInstaller()
-    : updates_disabled_(false), cus_(NULL) {
+PnaclComponentInstaller::PnaclComponentInstaller() : cus_(NULL) {
 }
 
 PnaclComponentInstaller::~PnaclComponentInstaller() {
@@ -345,13 +343,6 @@ void StartPnaclUpdateRegistration(PnaclComponentInstaller* pci) {
     }
   }
 
-  // If updates are disabled, only discover the current version
-  // and OverrideDirPnaclComponent. That way, developers can use
-  // a pinned version. Do not actually finish registration with
-  // the component update service.
-  if (pci->updates_disabled())
-    return;
-
   BrowserThread::PostTask(BrowserThread::UI,
                           FROM_HERE,
                           base::Bind(&FinishPnaclUpdateRegistration,
@@ -370,10 +361,7 @@ void StartPnaclUpdateRegistration(PnaclComponentInstaller* pci) {
 }  // namespace
 
 void PnaclComponentInstaller::RegisterPnaclComponent(
-    ComponentUpdateService* cus,
-    const CommandLine& command_line) {
-  // Register PNaCl by default (can be disabled).
-  updates_disabled_ = command_line.HasSwitch(switches::kDisablePnaclInstall);
+    ComponentUpdateService* cus) {
   cus_ = cus;
   BrowserThread::PostTask(BrowserThread::FILE,
                           FROM_HERE,

chrome/browser/component_updater/pnacl/pnacl_component_installer.h

@@ -16,7 +16,6 @@
 #include "chrome/browser/component_updater/component_updater_service.h"
 
 namespace base {
-class CommandLine;
 class DictionaryValue;
 }
 
@@ -50,14 +49,10 @@ class PnaclComponentInstaller : public ComponentInstaller {
                                 base::FilePath* installed_file) OVERRIDE;
 
   // Register a PNaCl component for the first time.
-  void RegisterPnaclComponent(ComponentUpdateService* cus,
-                              const base::CommandLine& command_line);
+  void RegisterPnaclComponent(ComponentUpdateService* cus);
 
   CrxComponent GetCrxComponent();
 
-  // Return true if PNaCl updates are disabled.
-  bool updates_disabled() const { return updates_disabled_; }
-
   // Determine the base directory for storing each version of PNaCl.
   base::FilePath GetPnaclBaseDirectory();
 
@@ -76,7 +71,6 @@ class PnaclComponentInstaller : public ComponentInstaller {
   ComponentUpdateService* cus() const { return cus_; }
 
  private:
-  bool updates_disabled_;
   base::Version current_version_;
   std::string current_fingerprint_;
   ComponentUpdateService* cus_;

components/nacl/common/nacl_switches.cc

@@ -9,9 +9,6 @@ namespace switches {
 // Disables crash throttling for Portable Native Client.
 const char kDisablePnaclCrashThrottling[]   = "disable-pnacl-crash-throttling";
 
-// Disables the installation of Portable Native Client.
-const char kDisablePnaclInstall[]           = "disable-pnacl-install";
-
 // Enables debugging via RSP over a socket.
 const char kEnableNaClDebug[]               = "enable-nacl-debug";
 

components/nacl/common/nacl_switches.h

@@ -12,7 +12,6 @@ namespace switches {
 // All switches in alphabetical order. The switches should be documented
 // alongside the definition of their values in the .cc file.
 extern const char kDisablePnaclCrashThrottling[];
-extern const char kDisablePnaclInstall[];
 extern const char kEnableNaClDebug[];
 extern const char kEnableNaClNonSfiMode[];
 extern const char kNaClBrokerProcess[];