Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8322)

Unified Diff: chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm

Issue 7686015: ui: Pass the parameter |languages| of StatusBubble::SetURL() as std::string. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm
diff --git a/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm b/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm
index 5188658c468c918bcfbeff84874b6481a6c86a39..537ee526ecf2ab647902a5ad60ba4b0c07a2e06e 100644
--- a/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm
+++ b/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm
@@ -7,8 +7,8 @@
#include "base/memory/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#include "base/utf_string_conversions.h"
-#import "chrome/browser/ui/cocoa/bubble_view.h"
#import "chrome/browser/ui/cocoa/browser_test_helper.h"
+#import "chrome/browser/ui/cocoa/bubble_view.h"
#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
#import "chrome/browser/ui/cocoa/status_bubble_mac.h"
#include "googleurl/src/gurl.h"
@@ -191,20 +191,20 @@ TEST_F(StatusBubbleMacTest, SetStatus) {
}
TEST_F(StatusBubbleMacTest, SetURL) {
- bubble_->SetURL(GURL(), string16());
+ bubble_->SetURL(GURL(), std::string());
EXPECT_FALSE(IsVisible());
- bubble_->SetURL(GURL("bad url"), string16());
+ bubble_->SetURL(GURL("bad url"), std::string());
EXPECT_FALSE(IsVisible());
- bubble_->SetURL(GURL("http://"), string16());
+ bubble_->SetURL(GURL("http://"), std::string());
EXPECT_TRUE(IsVisible());
EXPECT_NSEQ(@"http:", GetURLText());
- bubble_->SetURL(GURL("about:blank"), string16());
+ bubble_->SetURL(GURL("about:blank"), std::string());
EXPECT_TRUE(IsVisible());
EXPECT_NSEQ(@"about:blank", GetURLText());
- bubble_->SetURL(GURL("foopy://"), string16());
+ bubble_->SetURL(GURL("foopy://"), std::string());
EXPECT_TRUE(IsVisible());
EXPECT_NSEQ(@"foopy://", GetURLText());
- bubble_->SetURL(GURL("http://www.cnn.com"), string16());
+ bubble_->SetURL(GURL("http://www.cnn.com"), std::string());
EXPECT_TRUE(IsVisible());
EXPECT_NSEQ(@"www.cnn.com", GetURLText());
}
@@ -225,15 +225,15 @@ TEST_F(StatusBubbleMacTest, SetStatusAndURL) {
bubble_->SetStatus(UTF8ToUTF16("Status"));
EXPECT_TRUE(IsVisible());
EXPECT_NSEQ(@"Status", GetBubbleViewText());
- bubble_->SetURL(GURL("http://www.nytimes.com"), string16());
+ bubble_->SetURL(GURL("http://www.nytimes.com"), std::string());
EXPECT_TRUE(IsVisible());
EXPECT_NSEQ(@"www.nytimes.com", GetBubbleViewText());
- bubble_->SetURL(GURL(), string16());
+ bubble_->SetURL(GURL(), std::string());
EXPECT_TRUE(IsVisible());
EXPECT_NSEQ(@"Status", GetBubbleViewText());
bubble_->SetStatus(string16());
EXPECT_FALSE(IsVisible());
- bubble_->SetURL(GURL("http://www.nytimes.com"), string16());
+ bubble_->SetURL(GURL("http://www.nytimes.com"), std::string());
EXPECT_TRUE(IsVisible());
EXPECT_NSEQ(@"www.nytimes.com", GetBubbleViewText());
bubble_->SetStatus(UTF8ToUTF16("Status"));
@@ -242,7 +242,7 @@ TEST_F(StatusBubbleMacTest, SetStatusAndURL) {
bubble_->SetStatus(string16());
EXPECT_TRUE(IsVisible());
EXPECT_NSEQ(@"www.nytimes.com", GetBubbleViewText());
- bubble_->SetURL(GURL(), string16());
+ bubble_->SetURL(GURL(), std::string());
EXPECT_FALSE(IsVisible());
}
@@ -582,7 +582,7 @@ TEST_F(StatusBubbleMacTest, ExpandBubble) {
bubble_->SetStatus(UTF8ToUTF16("Showing"));
EXPECT_TRUE(IsVisible());
bubble_->SetURL(GURL("http://www.battersbox.com/peter_paul_and_mary.html"),
- string16());
+ std::string());
EXPECT_TRUE([GetURLText() hasSuffix:@"\u2026"]);
bubble_->ExpandBubble();
EXPECT_TRUE(IsVisible());
@@ -592,14 +592,14 @@ TEST_F(StatusBubbleMacTest, ExpandBubble) {
// Make sure bubble resets after hide.
bubble_->SetStatus(UTF8ToUTF16("Showing"));
bubble_->SetURL(GURL("http://www.snickersnee.com/pioneer_fishstix.html"),
- string16());
+ std::string());
EXPECT_TRUE([GetURLText() hasSuffix:@"\u2026"]);
// ...and that it expands again properly.
bubble_->ExpandBubble();
EXPECT_NSEQ(@"www.snickersnee.com/pioneer_fishstix.html", GetURLText());
// ...again, again!
bubble_->SetURL(GURL("http://www.battersbox.com/peter_paul_and_mary.html"),
- string16());
+ std::string());
bubble_->ExpandBubble();
EXPECT_NSEQ(@"www.battersbox.com/peter_paul_and_mary.html", GetURLText());
bubble_->Hide();
@@ -612,7 +612,7 @@ TEST_F(StatusBubbleMacTest, ExpandBubble) {
bubble_->SetStatus(UTF8ToUTF16("Showing"));
const char veryLongUrl[] =
"http://www.diewahrscheinlichlaengstepralinederwelt.com/duuuuplo.html";
- bubble_->SetURL(GURL(veryLongUrl), string16());
+ bubble_->SetURL(GURL(veryLongUrl), std::string());
EXPECT_TRUE([GetURLText() hasSuffix:@"\u2026"]);
bubble_->ExpandBubble();
EXPECT_TRUE([GetURLText() hasSuffix:@"\u2026"]);

Powered by Google App Engine
This is Rietveld 408576698