web-ui settings: Standard font setting now correlates to WebKit's standard fo...

chrome/browser/tab_contents/web_contents_unittest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_value_store.h"
@@ skipping 194 matching lines @@
                                Value::CreateBooleanValue(false));
 #endif
     pref_services->SetUserPref(prefs::kDefaultCharset,
                                Value::CreateStringValue("utf8"));
     pref_services->SetUserPref(prefs::kWebKitDefaultFontSize,
                                Value::CreateIntegerValue(20));
     pref_services->SetUserPref(prefs::kWebKitTextAreasAreResizable,
                                Value::CreateBooleanValue(false));
     pref_services->SetUserPref(prefs::kWebKitUsesUniversalDetector,
                                Value::CreateBooleanValue(true));
-    pref_services->SetUserPref(prefs::kWebKitStandardFontIsSerif,
-                               Value::CreateBooleanValue(true));
     pref_services->SetUserPref("webkit.webprefs.foo",
                                Value::CreateStringValue("bar"));
 
     RenderViewHostTestHarness::SetUp();
   }
 
   virtual void TearDown() {
     RenderViewHostTestHarness::TearDown();
 
     profile_.reset(NULL);
@@ skipping 1388 matching lines @@
 
   // And the interstitial should be showing.
   EXPECT_TRUE(other_contents->showing_interstitial_page());
 
   // And the interstitial should do a reload on don't proceed.
   EXPECT_TRUE(other_contents->interstitial_page()->reload_on_dont_proceed());
 }
 
 class ConstrainedWindowCloseTest : public ConstrainedWindow {
  public:
-  ConstrainedWindowCloseTest(TabContents* tab_contents)
+  explicit ConstrainedWindowCloseTest(TabContents* tab_contents)
       : tab_contents_(tab_contents) {
   }
 
   virtual void ShowConstrainedWindow() {}
   virtual void FocusConstrainedWindow() {}
   virtual ~ConstrainedWindowCloseTest() {}
 
   virtual void CloseConstrainedWindow() {
     tab_contents_->WillClose(this);
     close_count++;
   }
 
   int close_count;
   TabContents* tab_contents_;
 };
 
 TEST_F(TabContentsTest, ConstrainedWindows) {
   TabContents* tab_contents = CreateTestTabContents();
   ConstrainedWindowCloseTest window(tab_contents);
   window.close_count = 0;
 
   const int kWindowCount = 4;
   for (int i = 0; i < kWindowCount; i++) {
     tab_contents->AddConstrainedDialog(&window);
   }
   EXPECT_EQ(window.close_count, 0);
   delete tab_contents;
   EXPECT_EQ(window.close_count, kWindowCount);
 }