[Resources] Move roboto.woff and add roboto.woff2 to a roboto/ directory

chrome/browser/search/contextual_search_promo_source_android.cc

Index: chrome/browser/search/contextual_search_promo_source_android.cc
diff --git a/chrome/browser/search/contextual_search_promo_source_android.cc b/chrome/browser/search/contextual_search_promo_source_android.cc
index 41c40af8c2ca2357daffea9481d29e00cb89f188..76606e93626e8910c806767f26e70e161f96a51c 100644
--- a/chrome/browser/search/contextual_search_promo_source_android.cc
+++ b/chrome/browser/search/contextual_search_promo_source_android.cc
@@ -22,7 +22,8 @@ namespace {
 const char kPromoHTMLPath[] = "/promo.html";
 const char kPromoCSSPath[] = "/promo.css";
 const char kPromoJSPath[] = "/promo.js";
-const char kPromoRobotoPath[] = "/roboto.woff";
+const char kRobotoWoffPath[] = "/roboto.woff";
+const char kRobotoWoff2Path[] = "/roboto.woff2";
 
 }  // namespace
 
@@ -43,8 +44,10 @@ void ContextualSearchPromoSourceAndroid::StartDataRequest(
     SendResource(IDR_CONTEXTUAL_SEARCH_PROMO_CSS, callback);
   } else if (path == kPromoJSPath) {
     SendResource(IDR_CONTEXTUAL_SEARCH_PROMO_JS, callback);
-  } else if (path == kPromoRobotoPath) {
-    SendResource(IDR_CONTEXTUAL_SEARCH_ROBOTO_WOFF, callback);
+  } else if (path == kRobotoWoffPath) {
+    SendResource(IDR_ROBOTO_WOFF, callback);
+  } else if (path == kRobotoWoff2Path) {
+    SendResource(IDR_ROBOTO_WOFF2, callback);
   } else {
     callback.Run(NULL);
   }
@@ -62,6 +65,7 @@ std::string ContextualSearchPromoSourceAndroid::GetMimeType(
   if (EndsWith(path, ".css", false)) return "text/css";
   if (EndsWith(path, ".html", false)) return "text/html";
   if (EndsWith(path, ".woff", false)) return "font/woff";
+  if (EndsWith(path, ".woff2", false)) return "font/woff2";
   return "";
 }