Remove wstrings from status bubble code.

Use string16 instead.

BUG=23581

Review URL: http://codereview.chromium.org/3200010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58545 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 68 insertions, 62 deletions

diff --git a/chrome/browser/cocoa/status_bubble_mac.h b/chrome/browser/cocoa/status_bubble_mac.h
index 34599ae..c1a722f 100644
--- a/chrome/browser/cocoa/status_bubble_mac.h
+++ b/chrome/browser/cocoa/status_bubble_mac.h
@@ -11,6 +11,7 @@
 #import <Cocoa/Cocoa.h>
 #import <QuartzCore/QuartzCore.h>
 
+#include "base/string16.h"
 #include "base/task.h"
 #include "chrome/browser/status_bubble.h"
 
@@ -34,8 +35,8 @@ class StatusBubbleMac : public StatusBubble {
   virtual ~StatusBubbleMac();
 
   // StatusBubble implementation.
-  virtual void SetStatus(const std::wstring& status);
-  virtual void SetURL(const GURL& url, const std::wstring& languages);
+  virtual void SetStatus(const string16& status);
+  virtual void SetURL(const GURL& url, const string16& languages);
   virtual void Hide();
   virtual void MouseMoved(const gfx::Point& location, bool left_content);
   virtual void UpdateDownloadShelfVisibility(bool visible);
@@ -62,7 +63,7 @@ class StatusBubbleMac : public StatusBubble {
   void SetState(StatusBubbleState state);
 
   // Sets the bubble text for SetStatus and SetURL.
-  void SetText(const std::wstring& text, bool is_url);
+  void SetText(const string16& text, bool is_url);
 
   // Construct the window/widget if it does not already exist. (Safe to call if
   // it does.)
diff --git a/chrome/browser/cocoa/status_bubble_mac.mm b/chrome/browser/cocoa/status_bubble_mac.mm
index 9b6e063d4..98d3e07 100644
--- a/chrome/browser/cocoa/status_bubble_mac.mm
+++ b/chrome/browser/cocoa/status_bubble_mac.mm
@@ -11,6 +11,7 @@
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
+#include "base/utf_string_conversions.h"
 #import "chrome/browser/cocoa/bubble_view.h"
 #include "gfx/point.h"
 #include "googleurl/src/gurl.h"
@@ -112,13 +113,13 @@ StatusBubbleMac::~StatusBubbleMac() {
   }
 }
 
-void StatusBubbleMac::SetStatus(const std::wstring& status) {
+void StatusBubbleMac::SetStatus(const string16& status) {
   Create();
 
   SetText(status, false);
 }
 
-void StatusBubbleMac::SetURL(const GURL& url, const std::wstring& languages) {
+void StatusBubbleMac::SetURL(const GURL& url, const string16& languages) {
   Create();
 
   NSRect frame = [window_ frame];
@@ -129,17 +130,18 @@ void StatusBubbleMac::SetURL(const GURL& url, const std::wstring& languages) {
   gfx::Font font_chr(base::SysNSStringToWide([font fontName]),
                      [font pointSize]);
 
-  std::wstring status = gfx::ElideUrl(url, font_chr, text_width, languages);
+  string16 status = WideToUTF16(gfx::ElideUrl(url, font_chr, text_width,
+      UTF16ToWideHack(languages)));
 
   SetText(status, true);
 }
 
-void StatusBubbleMac::SetText(const std::wstring& text, bool is_url) {
+void StatusBubbleMac::SetText(const string16& text, bool is_url) {
   // The status bubble allows the status and URL strings to be set
   // independently.  Whichever was set non-empty most recently will be the
   // value displayed.  When both are empty, the status bubble hides.
 
-  NSString* text_ns = base::SysWideToNSString(text);
+  NSString* text_ns = base::SysUTF16ToNSString(text);
 
   NSString** main;
   NSString** backup;
diff --git a/chrome/browser/cocoa/status_bubble_mac_unittest.mm b/chrome/browser/cocoa/status_bubble_mac_unittest.mm
index 1da754d..d1e2b73 100644
--- a/chrome/browser/cocoa/status_bubble_mac_unittest.mm
+++ b/chrome/browser/cocoa/status_bubble_mac_unittest.mm
@@ -6,6 +6,7 @@
 
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
+#include "base/utf_string_conversions.h"
 #import "chrome/browser/cocoa/bubble_view.h"
 #import "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
@@ -112,42 +113,42 @@ class StatusBubbleMacTest : public CocoaTest {
 };
 
 TEST_F(StatusBubbleMacTest, SetStatus) {
-  bubble_->SetStatus(L"");
-  bubble_->SetStatus(L"This is a test");
+  bubble_->SetStatus(string16());
+  bubble_->SetStatus(UTF8ToUTF16("This is a test"));
   EXPECT_NSEQ(@"This is a test", GetText());
   EXPECT_TRUE(IsVisible());
 
   // Set the status to the exact same thing again
-  bubble_->SetStatus(L"This is a test");
+  bubble_->SetStatus(UTF8ToUTF16("This is a test"));
   EXPECT_NSEQ(@"This is a test", GetText());
 
   // Hide it
-  bubble_->SetStatus(L"");
+  bubble_->SetStatus(string16());
   EXPECT_FALSE(IsVisible());
 }
 
 TEST_F(StatusBubbleMacTest, SetURL) {
-  bubble_->SetURL(GURL(), L"");
+  bubble_->SetURL(GURL(), string16());
   EXPECT_FALSE(IsVisible());
-  bubble_->SetURL(GURL("bad url"), L"");
+  bubble_->SetURL(GURL("bad url"), string16());
   EXPECT_FALSE(IsVisible());
-  bubble_->SetURL(GURL("http://"), L"");
+  bubble_->SetURL(GURL("http://"), string16());
   EXPECT_TRUE(IsVisible());
   EXPECT_NSEQ(@"http:", GetURLText());
-  bubble_->SetURL(GURL("about:blank"), L"");
+  bubble_->SetURL(GURL("about:blank"), string16());
   EXPECT_TRUE(IsVisible());
   EXPECT_NSEQ(@"about:blank", GetURLText());
-  bubble_->SetURL(GURL("foopy://"), L"");
+  bubble_->SetURL(GURL("foopy://"), string16());
   EXPECT_TRUE(IsVisible());
   EXPECT_NSEQ(@"foopy://", GetURLText());
-  bubble_->SetURL(GURL("http://www.cnn.com"), L"");
+  bubble_->SetURL(GURL("http://www.cnn.com"), string16());
   EXPECT_TRUE(IsVisible());
   EXPECT_NSEQ(@"www.cnn.com", GetURLText());
 }
 
 // Test hiding bubble that's already hidden.
 TEST_F(StatusBubbleMacTest, Hides) {
-  bubble_->SetStatus(L"Showing");
+  bubble_->SetStatus(UTF8ToUTF16("Showing"));
   EXPECT_TRUE(IsVisible());
   bubble_->Hide();
   EXPECT_FALSE(IsVisible());
@@ -158,27 +159,27 @@ TEST_F(StatusBubbleMacTest, Hides) {
 // Test the "main"/"backup" behavior in StatusBubbleMac::SetText().
 TEST_F(StatusBubbleMacTest, SetStatusAndURL) {
   EXPECT_FALSE(IsVisible());
-  bubble_->SetStatus(L"Status");
+  bubble_->SetStatus(UTF8ToUTF16("Status"));
   EXPECT_TRUE(IsVisible());
   EXPECT_NSEQ(@"Status", GetBubbleViewText());
-  bubble_->SetURL(GURL("http://www.nytimes.com"), L"");
+  bubble_->SetURL(GURL("http://www.nytimes.com"), string16());
   EXPECT_TRUE(IsVisible());
   EXPECT_NSEQ(@"www.nytimes.com", GetBubbleViewText());
-  bubble_->SetURL(GURL(), L"");
+  bubble_->SetURL(GURL(), string16());
   EXPECT_TRUE(IsVisible());
   EXPECT_NSEQ(@"Status", GetBubbleViewText());
-  bubble_->SetStatus(L"");
+  bubble_->SetStatus(string16());
   EXPECT_FALSE(IsVisible());
-  bubble_->SetURL(GURL("http://www.nytimes.com"), L"");
+  bubble_->SetURL(GURL("http://www.nytimes.com"), string16());
   EXPECT_TRUE(IsVisible());
   EXPECT_NSEQ(@"www.nytimes.com", GetBubbleViewText());
-  bubble_->SetStatus(L"Status");
+  bubble_->SetStatus(UTF8ToUTF16("Status"));
   EXPECT_TRUE(IsVisible());
   EXPECT_NSEQ(@"Status", GetBubbleViewText());
-  bubble_->SetStatus(L"");
+  bubble_->SetStatus(string16());
   EXPECT_TRUE(IsVisible());
   EXPECT_NSEQ(@"www.nytimes.com", GetBubbleViewText());
-  bubble_->SetURL(GURL(), L"");
+  bubble_->SetURL(GURL(), string16());
   EXPECT_FALSE(IsVisible());
 }
 
@@ -194,7 +195,7 @@ TEST_F(StatusBubbleMacTest, StateTransitions) {
   States()->clear();
   EXPECT_TRUE(States()->empty());
 
-  bubble_->SetStatus(L"");
+  bubble_->SetStatus(string16());
   EXPECT_FALSE(IsVisible());
   EXPECT_EQ(StatusBubbleMac::kBubbleHidden, GetState());
   EXPECT_TRUE(States()->empty());  // no change from initial kBubbleHidden state
@@ -202,7 +203,7 @@ TEST_F(StatusBubbleMacTest, StateTransitions) {
   // Next, a few ordinary cases
 
   // Test StartShowing from kBubbleHidden
-  bubble_->SetStatus(L"Status");
+  bubble_->SetStatus(UTF8ToUTF16("Status"));
   EXPECT_TRUE(IsVisible());
   // Check GetState before checking States to make sure that all state
   // transitions have been flushed to States.
@@ -214,19 +215,19 @@ TEST_F(StatusBubbleMacTest, StateTransitions) {
 
   // Test StartShowing from kBubbleShown with the same message
   States()->clear();
-  bubble_->SetStatus(L"Status");
+  bubble_->SetStatus(UTF8ToUTF16("Status"));
   EXPECT_TRUE(IsVisible());
   EXPECT_EQ(StatusBubbleMac::kBubbleShown, GetState());
   EXPECT_TRUE(States()->empty());
 
   // Test StartShowing from kBubbleShown with a different message
-  bubble_->SetStatus(L"New Status");
+  bubble_->SetStatus(UTF8ToUTF16("New Status"));
   EXPECT_TRUE(IsVisible());
   EXPECT_EQ(StatusBubbleMac::kBubbleShown, GetState());
   EXPECT_TRUE(States()->empty());
 
   // Test StartHiding from kBubbleShown
-  bubble_->SetStatus(L"");
+  bubble_->SetStatus(string16());
   EXPECT_FALSE(IsVisible());
   // Check GetState before checking States to make sure that all state
   // transitions have been flushed to States.
@@ -238,7 +239,7 @@ TEST_F(StatusBubbleMacTest, StateTransitions) {
 
   // Test StartHiding from kBubbleHidden
   States()->clear();
-  bubble_->SetStatus(L"");
+  bubble_->SetStatus(string16());
   EXPECT_FALSE(IsVisible());
   EXPECT_EQ(StatusBubbleMac::kBubbleHidden, GetState());
   EXPECT_TRUE(States()->empty());
@@ -246,101 +247,103 @@ TEST_F(StatusBubbleMacTest, StateTransitions) {
   // Now, the edge cases
 
   // Test StartShowing from kBubbleShowingTimer
-  bubble_->SetStatus(L"Status");
+  bubble_->SetStatus(UTF8ToUTF16("Status"));
   SetState(StatusBubbleMac::kBubbleShowingTimer);
   [GetWindow() setAlphaValue:0.0];
   States()->clear();
   EXPECT_TRUE(States()->empty());
-  bubble_->SetStatus(L"Status");
+  bubble_->SetStatus(UTF8ToUTF16("Status"));
   EXPECT_EQ(StatusBubbleMac::kBubbleShown, GetState());
   EXPECT_EQ(2u, States()->size());
   EXPECT_EQ(StatusBubbleMac::kBubbleShowingFadeIn, StateAt(0));
   EXPECT_EQ(StatusBubbleMac::kBubbleShown, StateAt(1));
 
   // Test StartShowing from kBubbleShowingFadeIn
-  bubble_->SetStatus(L"Status");
+  bubble_->SetStatus(UTF8ToUTF16("Status"));
   SetState(StatusBubbleMac::kBubbleShowingFadeIn);
   [GetWindow() setAlphaValue:0.5];
   States()->clear();
   EXPECT_TRUE(States()->empty());
-  bubble_->SetStatus(L"Status");
+  bubble_->SetStatus(UTF8ToUTF16("Status"));
   // The actual state values can't be tested in immediate_ mode because
   // the window wasn't actually fading in.  Without immediate_ mode,
   // expect kBubbleShown.
-  bubble_->SetStatus(L"");  // Go back to a deterministic state.
+  bubble_->SetStatus(string16());  // Go back to a deterministic state.
 
   // Test StartShowing from kBubbleHidingTimer
-  bubble_->SetStatus(L"");
+  bubble_->SetStatus(string16());
   SetState(StatusBubbleMac::kBubbleHidingTimer);
   [GetWindow() setAlphaValue:1.0];
   States()->clear();
   EXPECT_TRUE(States()->empty());
-  bubble_->SetStatus(L"Status");
+  bubble_->SetStatus(UTF8ToUTF16("Status"));
   EXPECT_EQ(StatusBubbleMac::kBubbleShown, GetState());
   EXPECT_EQ(1u, States()->size());
   EXPECT_EQ(StatusBubbleMac::kBubbleShown, StateAt(0));
 
   // Test StartShowing from kBubbleHidingFadeOut
-  bubble_->SetStatus(L"");
+  bubble_->SetStatus(string16());
   SetState(StatusBubbleMac::kBubbleHidingFadeOut);
   [GetWindow() setAlphaValue:0.5];
   States()->clear();
   EXPECT_TRUE(States()->empty());
-  bubble_->SetStatus(L"Status");
+  bubble_->SetStatus(UTF8ToUTF16("Status"));
   EXPECT_EQ(StatusBubbleMac::kBubbleShown, GetState());
   EXPECT_EQ(2u, States()->size());
   EXPECT_EQ(StatusBubbleMac::kBubbleShowingFadeIn, StateAt(0));
   EXPECT_EQ(StatusBubbleMac::kBubbleShown, StateAt(1));
 
   // Test StartHiding from kBubbleShowingTimer
-  bubble_->SetStatus(L"Status");
+  bubble_->SetStatus(UTF8ToUTF16("Status"));
   SetState(StatusBubbleMac::kBubbleShowingTimer);
   [GetWindow() setAlphaValue:0.0];
   States()->clear();
   EXPECT_TRUE(States()->empty());
-  bubble_->SetStatus(L"");
+  bubble_->SetStatus(string16());
   EXPECT_EQ(StatusBubbleMac::kBubbleHidden, GetState());
   EXPECT_EQ(1u, States()->size());
   EXPECT_EQ(StatusBubbleMac::kBubbleHidden, StateAt(0));
 
   // Test StartHiding from kBubbleShowingFadeIn
-  bubble_->SetStatus(L"Status");
+  bubble_->SetStatus(UTF8ToUTF16("Status"));
   SetState(StatusBubbleMac::kBubbleShowingFadeIn);
   [GetWindow() setAlphaValue:0.5];
   States()->clear();
   EXPECT_TRUE(States()->empty());
-  bubble_->SetStatus(L"");
+  bubble_->SetStatus(string16());
   EXPECT_EQ(StatusBubbleMac::kBubbleHidden, GetState());
   EXPECT_EQ(2u, States()->size());
   EXPECT_EQ(StatusBubbleMac::kBubbleHidingFadeOut, StateAt(0));
   EXPECT_EQ(StatusBubbleMac::kBubbleHidden, StateAt(1));
 
   // Test StartHiding from kBubbleHidingTimer
-  bubble_->SetStatus(L"");
+  bubble_->SetStatus(string16());
   SetState(StatusBubbleMac::kBubbleHidingTimer);
   [GetWindow() setAlphaValue:1.0];
   States()->clear();
   EXPECT_TRUE(States()->empty());
-  bubble_->SetStatus(L"");
+  bubble_->SetStatus(string16());
   // The actual state values can't be tested in immediate_ mode because
   // the timer wasn't actually running.  Without immediate_ mode, expect
   // kBubbleHidingFadeOut and kBubbleHidden.
-  bubble_->SetStatus(L"Status");  // Go back to a deterministic state.
+  // Go back to a deterministic state.
+  bubble_->SetStatus(UTF8ToUTF16("Status"));
 
   // Test StartHiding from kBubbleHidingFadeOut
-  bubble_->SetStatus(L"");
+  bubble_->SetStatus(string16());
   SetState(StatusBubbleMac::kBubbleHidingFadeOut);
   [GetWindow() setAlphaValue:0.5];
   States()->clear();
   EXPECT_TRUE(States()->empty());
-  bubble_->SetStatus(L"");
+  bubble_->SetStatus(string16());
   // The actual state values can't be tested in immediate_ mode because
   // the window wasn't actually fading out.  Without immediate_ mode, expect
   // kBubbleHidden.
-  bubble_->SetStatus(L"Status");  // Go back to a deterministic state.
+  // Go back to a deterministic state.
+  bubble_->SetStatus(UTF8ToUTF16("Status"));
 
   // Test Hide from kBubbleHidden
-  bubble_->SetStatus(L"");
+  bubble_->SetStatus(string16());
   EXPECT_EQ(StatusBubbleMac::kBubbleHidden, GetState());
   States()->clear();
   EXPECT_TRUE(States()->empty());
@@ -349,7 +352,7 @@ TEST_F(StatusBubbleMacTest, StateTransitions) {
   EXPECT_TRUE(States()->empty());
 
   // Test Hide from kBubbleShowingTimer
-  bubble_->SetStatus(L"Status");
+  bubble_->SetStatus(UTF8ToUTF16("Status"));
   SetState(StatusBubbleMac::kBubbleShowingTimer);
   [GetWindow() setAlphaValue:0.0];
   States()->clear();
@@ -360,7 +363,7 @@ TEST_F(StatusBubbleMacTest, StateTransitions) {
   EXPECT_EQ(StatusBubbleMac::kBubbleHidden, StateAt(0));
 
   // Test Hide from kBubbleShowingFadeIn
-  bubble_->SetStatus(L"Status");
+  bubble_->SetStatus(UTF8ToUTF16("Status"));
   SetState(StatusBubbleMac::kBubbleShowingFadeIn);
   [GetWindow() setAlphaValue:0.5];
   States()->clear();
@@ -372,7 +375,7 @@ TEST_F(StatusBubbleMacTest, StateTransitions) {
   EXPECT_EQ(StatusBubbleMac::kBubbleHidden, StateAt(1));
 
   // Test Hide from kBubbleShown
-  bubble_->SetStatus(L"Status");
+  bubble_->SetStatus(UTF8ToUTF16("Status"));
   States()->clear();
   EXPECT_TRUE(States()->empty());
   bubble_->Hide();
@@ -381,7 +384,7 @@ TEST_F(StatusBubbleMacTest, StateTransitions) {
   EXPECT_EQ(StatusBubbleMac::kBubbleHidden, StateAt(0));
 
   // Test Hide from kBubbleHidingTimer
-  bubble_->SetStatus(L"Status");
+  bubble_->SetStatus(UTF8ToUTF16("Status"));
   SetState(StatusBubbleMac::kBubbleHidingTimer);
   States()->clear();
   EXPECT_TRUE(States()->empty());
@@ -391,7 +394,7 @@ TEST_F(StatusBubbleMacTest, StateTransitions) {
   EXPECT_EQ(StatusBubbleMac::kBubbleHidden, StateAt(0));
 
   // Test Hide from kBubbleHidingFadeOut
-  bubble_->SetStatus(L"Status");
+  bubble_->SetStatus(UTF8ToUTF16("Status"));
   SetState(StatusBubbleMac::kBubbleHidingFadeOut);
   [GetWindow() setAlphaValue:0.5];
   States()->clear();
@@ -410,7 +413,7 @@ TEST_F(StatusBubbleMacTest, Delete) {
 
   // Create then delete while visible.
   bubble = new StatusBubbleMac(window, nil);
-  bubble->SetStatus(L"showing");
+  bubble->SetStatus(UTF8ToUTF16("showing"));
   delete bubble;
 }
 
@@ -423,7 +426,7 @@ TEST_F(StatusBubbleMacTest, UpdateSizeAndPosition) {
 
   // Create a status bubble (with contents) and call resize (without actually
   // resizing); the frame size shouldn't change.
-  bubble_->SetStatus(L"UpdateSizeAndPosition test");
+  bubble_->SetStatus(UTF8ToUTF16("UpdateSizeAndPosition test"));
   ASSERT_TRUE(GetWindow());
   NSRect rect_before = [GetWindow() frame];
   bubble_->UpdateSizeAndPosition();
@@ -464,7 +467,7 @@ TEST_F(StatusBubbleMacTest, MovingWindowUpdatesPosition) {
   NSWindow* window = test_window();
 
   // Show the bubble and make sure it has the same origin as |window|.
-  bubble_->SetStatus(L"Showing");
+  bubble_->SetStatus(UTF8ToUTF16("Showing"));
   NSWindow* child = GetWindow();
   EXPECT_TRUE(NSEqualPoints([window frame].origin, [child frame].origin));
 
@@ -473,7 +476,7 @@ TEST_F(StatusBubbleMacTest, MovingWindowUpdatesPosition) {
   NSRect frame = [window frame];
   frame.origin.x += 50;
   [window setFrame:frame display:YES];
-  bubble_->SetStatus(L"Reshowing");
+  bubble_->SetStatus(UTF8ToUTF16("Reshowing"));
 
   // The bubble should reattach in the correct location.
   child = GetWindow();