Move string16 and char16 in to base::

base/strings/string16.cc

 // Copyright 2006-2008 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 "base/strings/string16.h"
 
 #include <ostream>
 
 #include "base/strings/utf_string_conversions.h"
 
@@ skipping 38 matching lines @@
 
 char16* c16memset(char16* s, char16 c, size_t n) {
   char16 *s_orig = s;
   while (n-- > 0) {
     *s = c;
     ++s;
   }
   return s_orig;
 }
 
-}  // namespace base
-
-template class std::basic_string<char16, base::string16_char_traits>;
-
-namespace base {
-
 std::ostream& operator<<(std::ostream& out, const string16& str) {
   return out << UTF16ToUTF8(str);
 }
 
 }  // namespace base
+
+template class std::basic_string<base::char16, base::string16_char_traits>;