When a font family pref changes to the empty string, pass it to WebKit.

chrome/browser/extensions/api/font_settings/font_settings_api.cc

Index: chrome/browser/extensions/api/font_settings/font_settings_api.cc
diff --git a/chrome/browser/extensions/api/font_settings/font_settings_api.cc b/chrome/browser/extensions/api/font_settings/font_settings_api.cc
index 93d6a9c32cebb19b224cd6c64026b000495df5f1..f9484fcd5a0960a2ba720a14de93f25638c3cc84 100644
--- a/chrome/browser/extensions/api/font_settings/font_settings_api.cc
+++ b/chrome/browser/extensions/api/font_settings/font_settings_api.cc
@@ -20,6 +20,7 @@
 #include "chrome/common/extensions/api/font_settings.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/pref_names_util.h"
 #include "content/public/browser/font_list_async.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
@@ -55,7 +56,6 @@ const char kOnMinimumFontSizeChanged[] =
 
 // Format for font name preference paths.
 const char kWebKitFontPrefFormat[] = "webkit.webprefs.fonts.%s.%s";
-const char kWebKitFontPrefPrefix[] = "webkit.webprefs.fonts.";
 
 // Gets the font name preference path for |generic_family| and |script|. If
 // |script| is NULL, uses prefs::kWebKitCommonScript.
@@ -70,22 +70,6 @@ std::string GetFontNamePrefPath(fonts::GenericFamily generic_family_enum,
                       script.c_str());
 }
 
-// Extracts the generic family and script from font name pref path |pref_path|.
-bool ParseFontNamePrefPath(std::string pref_path,
-                           std::string* generic_family,
-                           std::string* script) {
-  if (!StartsWithASCII(pref_path, kWebKitFontPrefPrefix, true))
-    return false;
-
-  size_t start = strlen(kWebKitFontPrefPrefix);
-  size_t pos = pref_path.find('.', start);
-  if (pos == std::string::npos || pos + 1 == pref_path.length())
-    return false;
-  *generic_family = pref_path.substr(start, pos - start);
-  *script = pref_path.substr(pos + 1);
-  return true;
-}
-
 // Returns the localized name of a font so that it can be matched within the
 // list of system fonts. On Windows, the list of system fonts has names only
 // for the system locale, but the pref value may be in the English name.
@@ -180,7 +164,9 @@ void FontSettingsEventRouter::Observe(
 
   std::string generic_family;
   std::string script;
-  if (ParseFontNamePrefPath(*pref_name, &generic_family, &script)) {
+  if (pref_names_util::ParseFontNamePrefPath(*pref_name,
+                                             &generic_family,
+                                             &script)) {

[tony, 2012/10/29 18:13:52]

Nit: I would put &generic_family on the previous line (looks like it'll fit and
that's what is done in the line below).

[falken, 2012/10/30 00:12:38]

Done.

     OnFontNamePrefChanged(pref_service, *pref_name, generic_family, script,
                           incognito);
     return;