Remove NPAPI from browser and utility

ui/views_content_client/views_content_client_main_parts_mac.mm

 // Copyright 2014 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/files/file_path.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #include "base/path_service.h"
@@ skipping 36 matching lines @@
 };
 
 ViewsContentClientMainPartsMac::ViewsContentClientMainPartsMac(
     const content::MainFunctionParams& content_params,
     ViewsContentClient* views_content_client)
     : ViewsContentClientMainParts(content_params, views_content_client) {
   // Cache the child process path to avoid triggering an AssertIOAllowed.
   base::FilePath child_process_exe;
   PathService::Get(content::CHILD_PROCESS_EXE, &child_process_exe);
 
-  // Disable plugin discovery since NPAPI plugin support on Mac requires this to
-  // be done in a utility process type which isn't bundled with this executable.
-  content::PluginService::GetInstance()->DisablePluginsDiscoveryForTesting();
-
   app_controller_.reset([[ViewsContentClientAppController alloc] init]);
   [[NSApplication sharedApplication] setDelegate:app_controller_];
 }
 
 void ViewsContentClientMainPartsMac::PreMainMessageLoopRun() {
   ViewsContentClientMainParts::PreMainMessageLoopRun();
 
   // On Mac, the task must be deferred to applicationDidFinishLaunching. If not,
   // the widget can activate, but (even if configured) the mainMenu won't be
   // ready to switch over in the OSX UI, so it will look strange.
@@ skipping 44 matching lines @@
   NSString* quitTitle = [@"Quit " stringByAppendingString:appName];
   [appMenu addItemWithTitle:quitTitle
                      action:@selector(terminate:)
               keyEquivalent:@"q"];
   [appMenuItem setSubmenu:appMenu];
 
   task_.Run();
 }
 
 @end