android build: progress on content and libjingle.

content/browser/browsing_instance.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 "content/browser/browsing_instance.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "content/browser/site_instance.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/web_ui_factory.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 
+#if defined(OS_ANDROID)
+namespace BASE_HASH_NAMESPACE {
+template<>
+struct hash<content::BrowserContext*> {

[jam, 2012/01/23 17:13:13]

btw i just noticed that browser_context already has this, behind an 

#if defined(COMPILER_GCC) && !defined(OS_ANDROID)

so just take out the android part of the ifdef there

[jam, 2012/01/25 21:27:52]

what about this one?

+  std::size_t operator()(content::BrowserContext* const& ptr) const {
+    return hash<size_t>()(reinterpret_cast<size_t>(ptr));
+  }
+};
+}  // BASE_HASH_NAMESPACE
+#endif  // OS_ANDROID
+
 // static
 base::LazyInstance<
     BrowsingInstance::ContextSiteInstanceMap,
     base::LeakyLazyInstanceTraits<BrowsingInstance::ContextSiteInstanceMap> >
         BrowsingInstance::context_site_instance_map_ =
             LAZY_INSTANCE_INITIALIZER;
 
 BrowsingInstance::BrowsingInstance(content::BrowserContext* browser_context)
     : browser_context_(browser_context) {
 }
@@ skipping 123 matching lines @@
     return true;
   }
   return false;
 }
 
 BrowsingInstance::~BrowsingInstance() {
   // We should only be deleted when all of the SiteInstances that refer to
   // us are gone.
   DCHECK(site_instance_map_.empty());
 }