Checkpoint: android fixes towards compilation of unit_tests.

chrome/browser/profiles/profile.h

Index: chrome/browser/profiles/profile.h
diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile.h
index 3954e5aff515555cfc3d140447b5fc41eaa0a9cc..9d6f626f224a97e04b563e58b733a7ee3a856043 100644
--- a/chrome/browser/profiles/profile.h
+++ b/chrome/browser/profiles/profile.h
@@ -11,6 +11,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/hash_tables.h"
 #include "base/logging.h"
 #include "chrome/browser/net/preconnect.h" // TODO: remove this.
 #include "chrome/browser/net/pref_proxy_config_tracker.h"
@@ -66,6 +67,10 @@ namespace content {
 class WebUI;
 }
 
+namespace android {
+class TabContentsProvider;
+}
+
 namespace fileapi {
 class FileSystemContext;
 }
@@ -143,6 +148,7 @@ class Profile : public content::BrowserContext {
     friend class SyncTest;
     friend class Toolbar5Importer;
     friend class TranslateManager;
+    friend class android::TabContentsProvider;
     friend class chromeos::LibCrosServiceLibraryImpl;
     friend class chromeos::ResetDefaultProxyConfigServiceTask;
 
@@ -563,7 +569,7 @@ class Profile : public content::BrowserContext {
 };
 
 #if defined(COMPILER_GCC)
-namespace __gnu_cxx {
+namespace BASE_HASH_NAMESPACE {
 
 template<>
 struct hash<Profile*> {
@@ -572,7 +578,7 @@ struct hash<Profile*> {
   }
 };
 
-}  // namespace __gnu_cxx
+}  // namespace BASE_HASH_NAMESPACE
 #endif
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_H_