Turn on better popup blocker by default.

chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc

 // Copyright 2013 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 "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
@@ skipping 56 matching lines @@
 
   int count_;
 
   DISALLOW_COPY_AND_ASSIGN(CountRenderViewHosts);
 };
 
 class PopupBlockerBrowserTest : public InProcessBrowserTest {
  public:
   PopupBlockerBrowserTest() {}
 
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    InProcessBrowserTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(switches::kDisableBetterPopupBlocking);
+  }
+
   // Returns a url that shows one popup.
   GURL GetTestURL() {
     return ui_test_utils::GetTestUrl(
       base::FilePath(kTestDir),
       base::FilePath(FILE_PATH_LITERAL("popup-blocked-to-post-blank.html")));
   }
 
   std::vector<WebContents*> GetBlockedContents(Browser* browser) {
     // Do a round trip to the renderer first to flush any in-flight IPCs to
     // create a to-be-blocked window.
@@ skipping 124 matching lines @@
   OmniboxEditModel* model = location_bar->GetLocationEntry()->model();
   EXPECT_EQ(GURL(search_string), model->CurrentMatch(NULL).destination_url);
   EXPECT_EQ(ASCIIToUTF16(search_string), model->CurrentMatch(NULL).contents);
 }
 
 class BetterPopupBlockerBrowserTest : public PopupBlockerBrowserTest {
  public:
   BetterPopupBlockerBrowserTest() {}
   virtual ~BetterPopupBlockerBrowserTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {

[marja, 2013/07/25 13:42:51]

This overridden func is now unnecessary.

[marja, 2013/07/25 13:47:11]

I was fooled by the code! This is for bypassing the immediate parent function!
How sneaky!

-    PopupBlockerBrowserTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kEnableBetterPopupBlocking);
+    InProcessBrowserTest::SetUpCommandLine(command_line);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BetterPopupBlockerBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(BetterPopupBlockerBrowserTest,
                        BlockWebContentsCreation) {
   CountRenderViewHosts counter;
 
@@ skipping 199 matching lines @@
   Browser* new_browser = browser_observer.WaitForSingleNewBrowser();
 
   // Check that the referrer was correctly set.
   web_contents = new_browser->tab_strip_model()->GetActiveWebContents();
   base::string16 expected_title(base::ASCIIToUTF16("PASS"));
   content::TitleWatcher title_watcher(web_contents, expected_title);
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 
 }  // namespace