android build: progress on content and libjingle.

content/common/np_channel_base.h

 // Copyright (c) 2011 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 CONTENT_COMMON_NP_CHANNEL_BASE_H_
 #define CONTENT_COMMON_NP_CHANNEL_BASE_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/message_router.h"
 #include "content/common/npobject_base.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace base {
 class MessageLoopProxy;
 }
 
 #if defined(COMPILER_GCC)
-namespace __gnu_cxx {
+namespace BASE_HASH_NAMESPACE {
 
 template<>
 struct hash<NPObject*> {
   std::size_t operator()(NPObject* const& ptr) const {
     return hash<size_t>()(reinterpret_cast<size_t>(ptr));
   }
 };
 
 }  // namespace __gnu_cxx
 #elif defined(COMPILER_MSVC)
@@ skipping 156 matching lines @@
   // a result of a sync call from the renderer must unblock the renderer.  We
   // additionally have to do this for async messages from the renderer that
   // have the unblock flag set, since they could be followed by a sync message
   // that won't get dispatched until the call to the renderer is complete.
   bool send_unblocking_only_during_unblock_dispatch_;
 
   DISALLOW_COPY_AND_ASSIGN(NPChannelBase);
 };
 
 #endif  // CONTENT_COMMON_NP_CHANNEL_BASE_H_