Revert "Enable MD by default on Windows for Canary/Dev and local builds."

ui/base/resource/resource_bundle.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 "ui/base/resource/resource_bundle.h"
 
 #include <stdint.h>
 
 #include <limits>
 #include <utility>
@@ skipping 39 matching lines @@
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "ui/gfx/platform_font_linux.h"
 #endif
 
 #if defined(OS_WIN)
 #include "ui/display/win/dpi.h"
 #endif
 
-// Helpers --------------------------------------------------------------------
-
 namespace ui {
 
 namespace {
 
 // PNG-related constants.
 const unsigned char kPngMagic[8] = { 0x89, 'P', 'N', 'G', 13, 10, 26, 10 };
 const size_t kPngChunkMetadataSize = 12;  // length, type, crc32
 const unsigned char kPngScaleChunkType[4] = { 'c', 's', 'C', 'l' };
 const unsigned char kPngDataChunkType[4] = { 'I', 'D', 'A', 'T' };
 
@@ skipping 37 matching lines @@
 
 SkBitmap CreateEmptyBitmap() {
   SkBitmap bitmap;
   bitmap.allocN32Pixels(32, 32);
   bitmap.eraseARGB(255, 255, 255, 0);
   return bitmap;
 }
 
 }  // namespace
 
-
-// ResourceBundle::TemporaryLoader --------------------------------------------
-
-ResourceBundle::TemporaryLoader::TemporaryLoader()
-    : already_loaded_(ResourceBundle::HasSharedInstance()) {
-  if (!already_loaded_) {
-    std::string locale = l10n_util::GetApplicationLocale(std::string());
-    const char kUserDataDirDialogFallbackLocale[] = "en-US";
-    if (locale.empty())
-      locale = kUserDataDirDialogFallbackLocale;
-    ui::ResourceBundle::InitSharedInstanceWithLocale(
-        locale, nullptr, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
-  }
-}
-
-ResourceBundle::TemporaryLoader::~TemporaryLoader() {
-  if (!already_loaded_)
-    ResourceBundle::CleanupSharedInstance();
-}
-
-
-// ResourceBundle::ResourceBundleImageSource ----------------------------------
-
 // An ImageSkiaSource that loads bitmaps for the requested scale factor from
 // ResourceBundle on demand for a given |resource_id|. If the bitmap for the
 // requested scale factor does not exist, it will return the 1x bitmap scaled
 // by the scale factor. This may lead to broken UI if the correct size of the
 // scaled image is not exactly |scale_factor| * the size of the 1x resource.
 // When --highlight-missing-scaled-resources flag is specified, scaled 1x images
 // are higlighted by blending them with red.
 class ResourceBundle::ResourceBundleImageSource : public gfx::ImageSkiaSource {
  public:
   ResourceBundleImageSource(ResourceBundle* rb, int resource_id)
@@ skipping 37 matching lines @@
     return gfx::ImageSkiaRep(image, scale);
   }
 
  private:
   ResourceBundle* rb_;
   const int resource_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceBundleImageSource);
 };
 
-
-// ResourceBundle -------------------------------------------------------------
-
 // static
 std::string ResourceBundle::InitSharedInstanceWithLocale(
     const std::string& pref_locale,
     Delegate* delegate,
     LoadResources load_resources) {
   InitSharedInstance(delegate);
   if (load_resources == LOAD_COMMON_RESOURCES)
     g_shared_instance_->LoadCommonResources();
   std::string result = g_shared_instance_->LoadLocaleResources(pref_locale);
   g_shared_instance_->InitDefaultFontList();
@@ skipping 712 matching lines @@
 // static
 bool ResourceBundle::DecodePNG(const unsigned char* buf,
                                size_t size,
                                SkBitmap* bitmap,
                                bool* fell_back_to_1x) {
   *fell_back_to_1x = PNGContainsFallbackMarker(buf, size);
   return gfx::PNGCodec::Decode(buf, size, bitmap);
 }
 
 }  // namespace ui