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

chrome/common/pref_names_util.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/common/pref_names_util.h"
+
+#include "base/string_util.h"
+
+namespace {

[Nico, 2012/10/30 04:24:29]

const has implicit internal linkage, no need for an unnamed namespace

[falken, 2012/10/30 07:01:34]

Done.

+
+const char kWebKitFontPrefPrefix[] = "webkit.webprefs.fonts.";

[Nico, 2012/10/30 04:24:29]

Add a comment to pref_names.cc where the webkit.webprefs.fonts are defined that
says "if you change this you also need to change the prefix in
prref_names_util.cc"

[falken, 2012/10/30 07:01:34]

Done. I also rearranged the pref orders to make a bit more sense.

+
+}
+
+namespace pref_names_util {
+
+bool ParseFontNamePrefPath(const 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;
+  if (generic_family)
+    *generic_family = pref_path.substr(start, pos - start);
+  if (script)
+    *script = pref_path.substr(pos + 1);
+  return true;
+}

[Nico, 2012/10/30 04:24:29]

no test for this?

[falken, 2012/10/30 07:01:34]

I added a unit test.

This was refactored out of the font settings API code, so it's also used within
the ExtensionApiTest.FontSetting* browser tests.

+
+}  // namespace pref_names_util