Cleanup various includes and namespace references.

These are mostly mechanical changes found while attempting to compile
the Android build with libc++.

BUG=427718
TBR=darin@chromium.org

Review URL: https://codereview.chromium.org/693773003

Cr-Commit-Position: refs/heads/master@{#302425}

base/debug/stack_trace_android.cc

@@ -6,6 +6,7 @@
 
 #include <android/log.h>
 #include <unwind.h>
+#include <ostream>
 
 #include "base/debug/proc_maps_linux.h"
 #include "base/strings/stringprintf.h"

base/test/multiprocess_test_android.cc

@@ -38,7 +38,7 @@ ProcessHandle SpawnMultiProcessTestChild(const std::string& procname,
     return pid;
   }
   // Child process.
-  std::hash_set<int> fds_to_keep_open;
+  base::hash_set<int> fds_to_keep_open;
   for (FileHandleMappingVector::const_iterator it = fds_to_remap->begin();
        it != fds_to_remap->end(); ++it) {
     fds_to_keep_open.insert(it->first);

content/browser/android/content_view_statics.cc

@@ -83,7 +83,7 @@ class SuspendedProcessWatcher : public content::RenderProcessHostObserver {
     std::vector<int>::iterator pos = std::find(suspended_processes_.begin(),
                                                suspended_processes_.end(),
                                                host->GetID());
-    DCHECK_NE(pos, suspended_processes_.end());
+    DCHECK(pos != suspended_processes_.end());
     host->RemoveObserver(this);
     suspended_processes_.erase(pos);
   }

content/browser/android/java/gin_java_bound_object.cc

@@ -185,7 +185,7 @@ void GinJavaBoundObject::EnsureMethodsAreSetUp() {
     }
 
     JavaMethod* method = new JavaMethod(java_method);
-    methods_.insert(std::make_pair(method->name(), method));
+    methods_.insert(std::make_pair(method->name(), make_linked_ptr(method)));
   }
 }
 

net/quic/crypto/source_address_token.cc

@@ -4,13 +4,10 @@
 
 #include "net/quic/crypto/source_address_token.h"
 
-#include <vector>
-
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 
 using std::string;
-using std::vector;
 
 namespace net {
 

net/quic/quic_sent_entropy_manager_test.cc

@@ -5,14 +5,12 @@
 #include "net/quic/quic_sent_entropy_manager.h"
 
 #include <algorithm>
-#include <vector>
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using std::make_pair;
 using std::pair;
-using std::vector;
 
 namespace net {
 namespace test {

third_party/protobuf/README.chromium

@@ -33,3 +33,5 @@ Revision 523 was cherry-picked from upstream.
 Revision 524 was cherry-picked from upstream.
 Revision 573 was cherry-picked from upstream.
 The `&file->options() != NULL &&` was removed from descriptor.cc
+References to `vector` were changed to `std::vector` in extension_set.h
+and unknown_field_set.h
\ No newline at end of file

third_party/protobuf/src/google/protobuf/extension_set.h

@@ -180,7 +180,7 @@ class LIBPROTOBUF_EXPORT ExtensionSet {
   // is useful to implement Reflection::ListFields().
   void AppendToList(const Descriptor* containing_type,
                     const DescriptorPool* pool,
-                    vector<const FieldDescriptor*>* output) const;
+                    std::vector<const FieldDescriptor*>* output) const;
 
   // =================================================================
   // Accessors

third_party/protobuf/src/google/protobuf/unknown_field_set.h

@@ -146,7 +146,7 @@ class LIBPROTOBUF_EXPORT UnknownFieldSet {
 
   void ClearFallback();
 
-  vector<UnknownField>* fields_;
+  std::vector<UnknownField>* fields_;
 
   GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(UnknownFieldSet);
 };