Remove net_resources.rc and net_resources.h and replace it

with a grd file that generates the same thing.  We want to do
this so on linux, we will have grit generate the .h file and
a platform specific resource file.

There's some munging going on to be able to get the
effective_tld_names_clean.dat file included in the rc.

This works in visual studio and scons.  I need to update
chrome_kjs.sln and the webkit*.sln files and the mac build before committing.

Review URL: http://codereview.chromium.org/16565

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7762 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 1 deletions

diff --git a/net/base/registry_controlled_domain.cc b/net/base/registry_controlled_domain.cc
index be485ac7..f6aa02a 100644
--- a/net/base/registry_controlled_domain.cc
+++ b/net/base/registry_controlled_domain.cc
@@ -45,9 +45,12 @@
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_parse.h"
 #include "net/base/net_module.h"
-#include "net/base/net_resources.h"
 #include "net/base/net_util.h"
 
+#if !defined(OS_MACOSX)
+#include "net_resources.h"
+#endif
+
 namespace net {
 
 // This list of rules is used by unit tests and any other time that the main
@@ -284,10 +287,14 @@ void RegistryControlledDomainService::UseDomainData(const std::string& data) {
 }
 
 void RegistryControlledDomainService::Init() {
+#if defined(OS_MACOSX)
+  ParseDomainData(kDefaultDomainData);
+#else
   // The resource file isn't present for some unit tests, for example.  Fall
   // back to a tiny, basic list of rules in that case.
   StringPiece res_data = NetModule::GetResource(IDR_EFFECTIVE_TLD_NAMES);
   ParseDomainData(!res_data.empty() ? res_data : kDefaultDomainData);
+#endif
 }
 
 void RegistryControlledDomainService::ParseDomainData(const StringPiece& data) {