Use base namespace for string16 in components and cloud_print.

components/sessions/serialized_navigation_entry.cc

 // Copyright 2013 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 "components/sessions/serialized_navigation_entry.h"
 
 #include "base/pickle.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_controller.h"
@@ skipping 158 matching lines @@
                          const std::string& str) {
   int num_bytes = str.size() * sizeof(char);
   if (*bytes_written + num_bytes < max_bytes) {
     *bytes_written += num_bytes;
     pickle->WriteString(str);
   } else {
     pickle->WriteString(std::string());
   }
 }
 
-// string16 version of WriteStringToPickle.
+// base::string16 version of WriteStringToPickle.
 //
 // TODO(akalin): Unify this, too.
 void WriteString16ToPickle(Pickle* pickle,
                            int* bytes_written,
                            int max_bytes,
-                           const string16& str) {
+                           const base::string16& str) {
   int num_bytes = str.size() * sizeof(char16);
   if (*bytes_written + num_bytes < max_bytes) {
     *bytes_written += num_bytes;
     pickle->WriteString16(str);
   } else {
-    pickle->WriteString16(string16());
+    pickle->WriteString16(base::string16());
   }
 }
 
 // A mask used for arbitrary boolean values needed to represent a
 // NavigationEntry. Currently only contains HAS_POST_DATA.
 //
 // NOTE(akalin): We may want to just serialize |has_post_data_|
 // directly.  Other bools (|is_overriding_user_agent_|) haven't been
 // added to this mask.
 enum TypeMask {
@@ skipping 277 matching lines @@
   for (std::vector<SerializedNavigationEntry>::const_iterator
        it = navigations.begin(); it != navigations.end(); ++it) {
     entries.push_back(
         it->ToNavigationEntry(page_id, browser_context).release());
     ++page_id;
   }
   return entries;
 }
 
 }  // namespace sessions