Remove disable-pnacl-install flag.

chrome/browser/component_updater/pnacl/pnacl_component_installer.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/browser/component_updater/pnacl/pnacl_component_installer.h"
 
 #include <string>
 #include <vector>
 
 #include "base/atomicops.h"
 #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"
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "base/version.h"
@@ skipping 171 matching lines @@
                  << " vs " << OmahaQueryParams::GetNaclArch() << ")";
     return false;
   }
 
   *version_out = version;
   return true;
 }
 
 }  // namespace
 
-PnaclComponentInstaller::PnaclComponentInstaller()
-    : updates_disabled_(false), cus_(NULL) {
+PnaclComponentInstaller::PnaclComponentInstaller() : cus_(NULL) {
 }
 
 PnaclComponentInstaller::~PnaclComponentInstaller() {
 }
 
 void PnaclComponentInstaller::OnUpdateError(int error) {
   NOTREACHED() << "Pnacl update error: " << error;
 }
 
 // Pnacl components have the version encoded in the path itself:
@@ skipping 120 matching lines @@
                                      &manifest_version) ||
         !current_version.Equals(manifest_version)) {
       current_version = Version(kNullVersion);
     } else {
       OverrideDirPnaclComponent(path);
       base::ReadFileToString(path.AppendASCII("manifest.fingerprint"),
                              &current_fingerprint);
     }
   }
 
-  // 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,
                                      current_version,
                                      current_fingerprint,
                                      pci));
 
   // Remove older versions of PNaCl.
   for (std::vector<base::FilePath>::iterator iter = older_dirs.begin();
        iter != older_dirs.end();
        ++iter) {
     base::DeleteFile(*iter, true);
   }
 }
 
 }  // 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,
                           base::Bind(&StartPnaclUpdateRegistration, this));
 }
 
 }  // namespace component_updater
 
 namespace pnacl {
 
 bool NeedsOnDemandUpdate() {
   return base::subtle::NoBarrier_Load(
              &component_updater::needs_on_demand_update) != 0;
 }
 
 }  // namespace pnacl