Replace string16 with base::string16 in src/webkit

webkit/glue/glue_serialize_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/pickle.h"
 #include "base/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebHTTPBody.h"
@@ skipping 101 matching lines @@
     float expectedPageScaleFactor = a.pageScaleFactor();
     WebPoint expectedScrollOffset = a.scrollOffset();
 #if defined(OS_ANDROID)
     if (version == 11) {
       expectedScrollOffset.x /= a.pageScaleFactor();
       expectedScrollOffset.y /= a.pageScaleFactor();
       expectedPageScaleFactor /= gfx::Screen::GetNativeScreen()
           ->GetPrimaryDisplay().device_scale_factor();
     }
 #endif
-    EXPECT_EQ(string16(a.urlString()), string16(b.urlString()));
-    EXPECT_EQ(string16(a.originalURLString()), string16(b.originalURLString()));
-    EXPECT_EQ(string16(a.target()), string16(b.target()));
-    EXPECT_EQ(string16(a.parent()), string16(b.parent()));
-    EXPECT_EQ(string16(a.title()), string16(b.title()));
-    EXPECT_EQ(string16(a.alternateTitle()), string16(b.alternateTitle()));
+    EXPECT_EQ(base::string16(a.urlString()), base::string16(b.urlString()));
+    EXPECT_EQ(base::string16(a.originalURLString()),
+              base::string16(b.originalURLString()));
+    EXPECT_EQ(base::string16(a.target()), base::string16(b.target()));
+    EXPECT_EQ(base::string16(a.parent()), base::string16(b.parent()));
+    EXPECT_EQ(base::string16(a.title()), base::string16(b.title()));
+    EXPECT_EQ(base::string16(a.alternateTitle()),
+              base::string16(b.alternateTitle()));
     EXPECT_EQ(a.lastVisitedTime(), b.lastVisitedTime());
     EXPECT_EQ(expectedScrollOffset, b.scrollOffset());
     EXPECT_EQ(a.isTargetItem(), b.isTargetItem());
     EXPECT_EQ(a.visitCount(), b.visitCount());
-    EXPECT_EQ(string16(a.referrer()), string16(b.referrer()));
+    EXPECT_EQ(base::string16(a.referrer()), base::string16(b.referrer()));
     if (version >= 11)
       EXPECT_EQ(expectedPageScaleFactor, b.pageScaleFactor());
     if (version >= 9)
       EXPECT_EQ(a.itemSequenceNumber(), b.itemSequenceNumber());
     if (version >= 6)
       EXPECT_EQ(a.documentSequenceNumber(), b.documentSequenceNumber());
 
     const WebVector<WebString>& a_docstate = a.documentState();
     const WebVector<WebString>& b_docstate = b.documentState();
     EXPECT_EQ(a_docstate.size(), b_docstate.size());
     for (size_t i = 0, c = a_docstate.size(); i < c; ++i)
-      EXPECT_EQ(string16(a_docstate[i]), string16(b_docstate[i]));
+      EXPECT_EQ(base::string16(a_docstate[i]), base::string16(b_docstate[i]));
   }
 
   void HistoryItemExpectFormDataEqual(const WebHistoryItem& a,
                                       const WebHistoryItem& b) {
     const WebHTTPBody& a_body = a.httpBody();
     const WebHTTPBody& b_body = b.httpBody();
     EXPECT_EQ(!a_body.isNull(), !b_body.isNull());
     if (!a_body.isNull() && !b_body.isNull()) {
       EXPECT_EQ(a_body.containsPasswordData(), b_body.containsPasswordData());
       EXPECT_EQ(a_body.elementCount(), b_body.elementCount());
       WebHTTPBody::Element a_elem, b_elem;
       for (size_t i = 0; a_body.elementAt(i, a_elem) &&
                          b_body.elementAt(i, b_elem); ++i) {
         EXPECT_EQ(a_elem.type, b_elem.type);
         if (a_elem.type == WebHTTPBody::Element::TypeData) {
           EXPECT_EQ(std::string(a_elem.data.data(), a_elem.data.size()),
                     std::string(b_elem.data.data(), b_elem.data.size()));
         } else {
-          EXPECT_EQ(string16(a_elem.filePath), string16(b_elem.filePath));
+          EXPECT_EQ(base::string16(a_elem.filePath),
+                    base::string16(b_elem.filePath));
         }
       }
     }
-    EXPECT_EQ(string16(a.httpContentType()), string16(b.httpContentType()));
+    EXPECT_EQ(base::string16(a.httpContentType()),
+              base::string16(b.httpContentType()));
   }
 
   void HistoryItemExpectChildrenEqual(const WebHistoryItem& a,
                                       const WebHistoryItem& b) {
     const WebVector<WebHistoryItem>& a_children = a.children();
     const WebVector<WebHistoryItem>& b_children = b.children();
     EXPECT_EQ(a_children.size(), b_children.size());
     for (size_t i = 0, c = a_children.size(); i < c; ++i)
       HistoryItemExpectEqual(a_children[i], b_children[i],
                              webkit_glue::HistoryItemCurrentVersion());
@@ skipping 163 matching lines @@
 
   ASSERT_FALSE(item1.isNull());
   ASSERT_FALSE(item2.isNull());
 
   // Form data was not removed.
   HistoryItemExpectEqual(item1, item2,
                          webkit_glue::HistoryItemCurrentVersion());
 }
 
 }  // namespace