Revert 72380 - Remove wstring from autocomplete....

chrome/browser/autocomplete/autocomplete_popup_view_gtk_unittest.cc

 // Copyright (c) 2011 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 "chrome/browser/autocomplete/autocomplete_popup_view_gtk.h"
 
 #include <gtk/gtk.h>
 
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "testing/platform_test.h"
 
 namespace {
 
 static const float kLargeWidth = 10000;
 
 const GdkColor kContentTextColor = GDK_COLOR_RGB(0x00, 0x00, 0x00);
@@ skipping 18 matching lines @@
     gtk_widget_destroy(window_);
 
     PlatformTest::TearDown();
   }
 
   // The google C++ Testing Framework documentation suggests making
   // accessors in the fixture so that each test doesn't need to be a
   // friend of the class being tested.  This method just proxies the
   // call through after adding the fixture's layout_.
   void SetupLayoutForMatch(
-      const string16& text,
+      const std::wstring& text,
       const AutocompleteMatch::ACMatchClassifications& classifications,
       const GdkColor* base_color,
       const GdkColor* dim_color,
       const GdkColor* url_color,
       const std::string& prefix_text) {
     AutocompletePopupViewGtk::SetupLayoutForMatch(layout_,
                                                   text,
                                                   classifications,
                                                   base_color,
                                                   dim_color,
@@ skipping 123 matching lines @@
   PangoLayout* layout_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupViewGtkTest);
 };
 
 // Simple inputs with no matches should result in styled output who's
 // text matches the input string, with the passed-in color, and
 // nothing bolded.
 TEST_F(AutocompletePopupViewGtkTest, DecorateMatchedStringNoMatch) {
-  const string16 kContents = ASCIIToUTF16("This is a test");
+  const std::wstring kContents = L"This is a test";
 
   AutocompleteMatch::ACMatchClassifications classifications;
 
   SetupLayoutForMatch(kContents,
                       classifications,
                       &kContentTextColor,
                       &kDimContentTextColor,
                       &kURLTextColor,
                       std::string());
 
@@ skipping 15 matching lines @@
     EXPECT_EQ(kContents.size(), weightLength);
     EXPECT_TRUE(RunHasWeight(0U,
                              kContents.size(),
                              PANGO_WEIGHT_NORMAL));
   }
 }
 
 // Identical to DecorateMatchedStringNoMatch, except test that URL
 // style gets a different color than we passed in.
 TEST_F(AutocompletePopupViewGtkTest, DecorateMatchedStringURLNoMatch) {
-  const string16 kContents = ASCIIToUTF16("This is a test");
+  const std::wstring kContents = L"This is a test";
   AutocompleteMatch::ACMatchClassifications classifications;
 
   classifications.push_back(
       ACMatchClassification(0U, ACMatchClassification::URL));
 
   SetupLayoutForMatch(kContents,
                       classifications,
                       &kContentTextColor,
                       &kDimContentTextColor,
                       &kURLTextColor,
@@ skipping 15 matching lines @@
   if (weightLength) {
     EXPECT_EQ(kContents.size(), weightLength);
     EXPECT_TRUE(RunHasWeight(0U,
                              kContents.size(),
                              PANGO_WEIGHT_NORMAL));
   }
 }
 
 // Test that DIM works as expected.
 TEST_F(AutocompletePopupViewGtkTest, DecorateMatchedStringDimNoMatch) {
-  const string16 kContents = ASCIIToUTF16("This is a test");
+  const std::wstring kContents = L"This is a test";
   // Dim "is".
   const guint runLength1 = 5, runLength2 = 2, runLength3 = 7;
   // Make sure nobody messed up the inputs.
   EXPECT_EQ(runLength1 + runLength2 + runLength3, kContents.size());
 
   // Push each run onto classifications.
   AutocompleteMatch::ACMatchClassifications classifications;
   classifications.push_back(
       ACMatchClassification(0U, ACMatchClassification::NONE));
   classifications.push_back(
@@ skipping 41 matching lines @@
     EXPECT_EQ(kContents.size(), weightLength);
     EXPECT_TRUE(RunHasWeight(0U,
                              kContents.size(),
                              PANGO_WEIGHT_NORMAL));
   }
 }
 
 // Test that the matched run gets bold-faced, but keeps the same
 // color.
 TEST_F(AutocompletePopupViewGtkTest, DecorateMatchedStringMatch) {
-  const string16 kContents = ASCIIToUTF16("This is a test");
+  const std::wstring kContents = L"This is a test";
   // Match "is".
   const guint runLength1 = 5, runLength2 = 2, runLength3 = 7;
   // Make sure nobody messed up the inputs.
   EXPECT_EQ(runLength1 + runLength2 + runLength3, kContents.size());
 
   // Push each run onto classifications.
   AutocompleteMatch::ACMatchClassifications classifications;
   classifications.push_back(
       ACMatchClassification(0U, ACMatchClassification::NONE));
   classifications.push_back(
@@ skipping 37 matching lines @@
             RunLengthForAttrType(0U,
                                  kContents.size(),
                                  PANGO_ATTR_FOREGROUND));
   EXPECT_TRUE(RunHasColor(0U,
                           kContents.size(),
                           kContentTextColor));
 }
 
 // Just like DecorateMatchedStringURLMatch, this time with URL style.
 TEST_F(AutocompletePopupViewGtkTest, DecorateMatchedStringURLMatch) {
-  const string16 kContents = ASCIIToUTF16("http://hello.world/");
+  const std::wstring kContents = L"http://hello.world/";
   // Match "hello".
   const guint runLength1 = 7, runLength2 = 5, runLength3 = 7;
   // Make sure nobody messed up the inputs.
   EXPECT_EQ(runLength1 + runLength2 + runLength3, kContents.size());
 
   // Push each run onto classifications.
   AutocompleteMatch::ACMatchClassifications classifications;
   classifications.push_back(
       ACMatchClassification(0U, ACMatchClassification::URL));
   const int kURLMatch =
@@ skipping 15 matching lines @@
   // One color for the entire string, and it's not the one we passed
   // in.
   EXPECT_EQ(kContents.size(),
             RunLengthForAttrType(0U,
                                  kContents.size(),
                                  PANGO_ATTR_FOREGROUND));
   EXPECT_TRUE(RunHasColor(0U,
                           kContents.size(),
                           kURLTextColor));
 }