Revert r108760 / reland r108744, r108753 w/ fix

chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #import "chrome/browser/ui/cocoa/hyperlink_button_cell.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
+#include "content/browser/plugin_service.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "webkit/plugins/npapi/plugin_list.h"
 
 namespace {
 
 // Must match the tag of the unblock radio button in the xib files.
 const int kAllowTag = 1;
 
 // Must match the tag of the block radio button in the xib files.
 const int kBlockTag = 2;
 
 // Height of one link in the popup list.
@@ skipping 207 matching lines @@
     int delta = NSMinY([titleLabel_ frame]) -
                 NSMinY([blockedResourcesField_ frame]);
     [blockedResourcesField_ removeFromSuperview];
     NSRect frame = [[self window] frame];
     frame.size.height -= delta;
     [[self window] setFrame:frame display:NO];
   } else {
     for (std::set<std::string>::iterator it = plugins.begin();
          it != plugins.end(); ++it) {
       NSString* name = SysUTF16ToNSString(
-          webkit::npapi::PluginList::Singleton()->GetPluginGroupName(*it));
+          PluginService::GetInstance()->GetPluginGroupName(*it));
       if ([name length] == 0)
         name = base::SysUTF8ToNSString(*it);
       [pluginArray addObject:name];
     }
     [blockedResourcesField_
         setStringValue:[pluginArray componentsJoinedByString:@"\n"]];
     [GTMUILocalizerAndLayoutTweaker
         sizeToFitFixedWidthTextField:blockedResourcesField_];
   }
 }
@@ skipping 224 matching lines @@
 
 - (IBAction)manageBlocking:(id)sender {
   contentSettingBubbleModel_->OnManageLinkClicked();
 }
 
 - (IBAction)closeBubble:(id)sender {
   [self close];
 }
 
 @end  // ContentSettingBubbleController