Remove the two years old code to enable the nacl plugin once if it's disabled. This was added to de…

content/browser/plugin_loader_posix.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 "content/browser/plugin_loader_posix.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
@@ skipping 57 matching lines @@
 
 void PluginLoaderPosix::GetPluginsToLoad() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   base::TimeTicks start_time(base::TimeTicks::Now());
 
   loaded_plugins_.clear();
   next_load_index_ = 0;
 
   canonical_list_.clear();
-  PluginServiceImpl::GetInstance()->GetPluginList()->GetPluginPathsToLoad(
+  webkit::npapi::PluginList::Singleton()->GetPluginPathsToLoad(

[Bernhard Bauer, 2013/07/17 15:59:52]

Is this related to this change?

[jam, 2013/07/17 16:02:16]

yep, I removed PluginService::GetPluginList since it was only there for
PluginPrefs

[Bernhard Bauer, 2013/07/17 16:06:33]

But... it's used by this class, no? :)

The least-intrusive change would be to only remove it from the PluginService
interface, but leave it in PluginServiceImpl, but this way is fine with me too.

[jam, 2013/07/17 16:10:43]

My plan is to remove MockPluginList since most of its users are in chrome and I
want to hide PluginList altogether. I will introduce another way to do the same
thing through PluginService. At that point, there'll be no plugin_list_ member
in PluginServiceImpl. So I was doing this change in anticipation of what the
final code will look like.

       &canonical_list_);
 
   internal_plugins_.clear();
-  PluginServiceImpl::GetInstance()->GetPluginList()->GetInternalPlugins(
+  webkit::npapi::PluginList::Singleton()->GetInternalPlugins(
       &internal_plugins_);
 
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(&PluginLoaderPosix::LoadPluginsInternal,
                  make_scoped_refptr(this)));
 
   HISTOGRAM_TIMES("PluginLoaderPosix.GetPluginList",
                   (base::TimeTicks::Now() - start_time) *
                       base::Time::kMicrosecondsPerMillisecond);
 }
@@ skipping 63 matching lines @@
       return true;
     }
   }
   return false;
 }
 
 bool PluginLoaderPosix::MaybeRunPendingCallbacks() {
   if (next_load_index_ < canonical_list_.size())
     return false;
 
-  PluginServiceImpl::GetInstance()->GetPluginList()->SetPlugins(
-      loaded_plugins_);
+  webkit::npapi::PluginList::Singleton()->SetPlugins(loaded_plugins_);
 
   // Only call the first callback with loaded plugins because there may be
   // some extra plugin paths added since the first callback is added.
   if (!callbacks_.empty()) {
     PendingCallback callback = callbacks_.front();
     callbacks_.pop_front();
     callback.target_loop->PostTask(
         FROM_HERE,
         base::Bind(callback.callback, loaded_plugins_));
   }
@@ skipping 15 matching lines @@
     scoped_refptr<base::MessageLoopProxy> loop,
     const PluginService::GetPluginsCallback& cb)
     : target_loop(loop),
       callback(cb) {
 }
 
 PluginLoaderPosix::PendingCallback::~PendingCallback() {
 }
 
 }  // namespace content