| Index: content/child/browser_font_resource_trusted.cc
|
| diff --git a/content/child/browser_font_resource_trusted.cc b/content/child/browser_font_resource_trusted.cc
|
| index 39746a82fc5af620df2465a76a5833427817415e..15f8290793bb03ee1130265e62198e910de6ef99 100644
|
| --- a/content/child/browser_font_resource_trusted.cc
|
| +++ b/content/child/browser_font_resource_trusted.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| +#include "content/public/common/web_preferences.h"
|
| #include "ppapi/c/dev/ppb_font_dev.h"
|
| #include "ppapi/proxy/connection.h"
|
| #include "ppapi/shared_impl/ppapi_preferences.h"
|
| @@ -43,11 +44,9 @@ namespace {
|
| // undefined reference linker error.
|
| const char kCommonScript[] = "Zyyy";
|
|
|
| -base::string16 GetFontFromMap(
|
| - const webkit_glue::ScriptFontFamilyMap& map,
|
| - const std::string& script) {
|
| - webkit_glue::ScriptFontFamilyMap::const_iterator it =
|
| - map.find(script);
|
| +base::string16 GetFontFromMap(const ScriptFontFamilyMap& map,
|
| + const std::string& script) {
|
| + ScriptFontFamilyMap::const_iterator it = map.find(script);
|
| if (it != map.end())
|
| return it->second;
|
| return base::string16();
|
|
|