Turn on better popup blocker by default.

chrome/browser/ui/content_settings/content_setting_bubble_model.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/ui/content_settings/content_setting_bubble_model.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 527 matching lines @@
     WebContents* web_contents,
     Profile* profile,
     ContentSettingsType content_type)
     : ContentSettingSingleRadioGroup(
         delegate, web_contents, profile, content_type) {
   SetPopups();
 }
 
 
 void ContentSettingPopupBubbleModel::SetPopups() {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableBetterPopupBlocking)) {
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableBetterPopupBlocking)) {
     std::map<int32, GURL> blocked_popups =
         PopupBlockerTabHelper::FromWebContents(web_contents())
             ->GetBlockedPopupRequests();
     for (std::map<int32, GURL>::const_iterator iter = blocked_popups.begin();
          iter != blocked_popups.end();
          ++iter) {
       std::string title(iter->second.spec());
       // The popup may not have a valid URL.
       if (title.empty())
         title = l10n_util::GetStringUTF8(IDS_TAB_LOADING_TITLE);
@@ skipping 17 matching lines @@
     if (title.empty())
       title = l10n_util::GetStringUTF8(IDS_TAB_LOADING_TITLE);
     PopupItem popup_item(
         FaviconTabHelper::FromWebContents(*i)->GetFavicon(), title, *i);
     add_popup(popup_item);
   }
 }
 
 void ContentSettingPopupBubbleModel::OnPopupClicked(int index) {
   if (web_contents()) {
-    if (CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kEnableBetterPopupBlocking)) {
+    if (!CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kDisableBetterPopupBlocking)) {
       PopupBlockerTabHelper::FromWebContents(web_contents())->
           ShowBlockedPopup(bubble_content().popup_items[index].popup_id);
     } else {
       BlockedContentTabHelper::FromWebContents(web_contents())->
           LaunchForContents(bubble_content().popup_items[index].web_contents);
     }
   }
 }
 
 // The model of the content settings bubble for media settings.
@@ skipping 649 matching lines @@
   if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
     DCHECK_EQ(web_contents_,
               content::Source<WebContents>(source).ptr());
     web_contents_ = NULL;
   } else {
     DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type);
     DCHECK_EQ(profile_, content::Source<Profile>(source).ptr());
     profile_ = NULL;
   }
 }