Revert my change to get the tree green. Not sure why the tests became flaky....

chrome/common/resource_bundle.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef CHROME_COMMON_RESOURCE_BUNDLE_H__
 #define CHROME_COMMON_RESOURCE_BUNDLE_H__
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
@@ skipping 101 matching lines @@
 
  private:
   // We define a DataHandle typedef to abstract across how data is stored
   // across platforms.
 #if defined(OS_WIN)
   // Windows stores resources in DLLs, which are managed by HINSTANCE.
   typedef HINSTANCE DataHandle;
 #elif defined(OS_LINUX)
   // Linux will use base::DataPack.  TODO(evanm): finish this.
   typedef base::DataPack* DataHandle;
-#elif defined(OS_MACOSX)
-  // TODO(port): figure this out
-  typedef void* DataHandle;
 #endif
 
   // Ctor/dtor are private, since we're a singleton.
   ResourceBundle();
   ~ResourceBundle();
 
   // Free skia_images_.
   void FreeImages();
 
   // Try to load the locale specific strings from an external data module.
@@ skipping 39 matching lines @@
   scoped_ptr<ChromeFont> large_font_;
   scoped_ptr<ChromeFont> web_font_;
 
   static ResourceBundle* g_shared_instance_;
 
   DISALLOW_EVIL_CONSTRUCTORS(ResourceBundle);
 };
 
 #endif // CHROME_COMMON_RESOURCE_BUNDLE_H__