Revert "Add COMPONENT_BUILD global define. "

ui/base/resource/resource_bundle_dummy.cc

Index: ui/base/resource/resource_bundle_dummy.cc
diff --git a/ui/base/resource/resource_bundle_dummy.cc b/ui/base/resource/resource_bundle_dummy.cc
index 0dbf1f1f1678b379618d7fa2fcf9fd22a18f0775..82afaab806d17f8d89001f11ba2d2c0e09d8d83c 100644
--- a/ui/base/resource/resource_bundle_dummy.cc
+++ b/ui/base/resource/resource_bundle_dummy.cc
@@ -8,19 +8,26 @@
 
 #include "base/logging.h"
 #include "base/synchronization/lock.h"
+#include "ui/gfx/font.h"
+#include "ui/gfx/platform_font_win.h"
 
 // NOTE(gregoryd): This is a hack to avoid creating more nacl_win64-specific
 // files. The font members of ResourceBundle are never initialized in our code
-// so we can get away with an empty class definition.
+// so this destructor is never called.
 namespace gfx {
-class Font {};
+Font::~Font() {
+  NOTREACHED();
+}
+PlatformFontWin::HFontRef::~HFontRef() {
+  NOTREACHED();
+}
 }
 
 namespace ui {
 
 ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
 
-// static
+/* static */
 std::string ResourceBundle::InitSharedInstance(
     const std::string& pref_locale) {
   DCHECK(g_shared_instance_ == NULL) << "ResourceBundle initialized twice";
@@ -28,7 +35,7 @@ std::string ResourceBundle::InitSharedInstance(
   return std::string();
 }
 
-// static
+/* static */
 void ResourceBundle::CleanupSharedInstance() {
   if (g_shared_instance_) {
     delete g_shared_instance_;
@@ -36,7 +43,7 @@ void ResourceBundle::CleanupSharedInstance() {
   }
 }
 
-// static
+/* static */
 ResourceBundle& ResourceBundle::GetSharedInstance() {
   // Must call InitSharedInstance before this function.
   CHECK(g_shared_instance_ != NULL);