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

Unified Diff: chrome_frame/test/mock_ie_event_sink_actions.h

Issue 113143006: Add base:: to string16 in chrome_frame/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
« no previous file with comments | « chrome_frame/test/ie_configurator.cc ('k') | chrome_frame/test/test_scrubber.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/mock_ie_event_sink_actions.h
diff --git a/chrome_frame/test/mock_ie_event_sink_actions.h b/chrome_frame/test/mock_ie_event_sink_actions.h
index 9aa57a12d356c285cb6284d4916c02c1b19b1d51..ff13a7fcf96663cb4c8b9efcda309575da796a00 100644
--- a/chrome_frame/test/mock_ie_event_sink_actions.h
+++ b/chrome_frame/test/mock_ie_event_sink_actions.h
@@ -43,15 +43,15 @@ MATCHER_P(AccSatisfies, matcher, "satisfies the given AccObjectMatcher") {
// |arg|. Both url and title are matched to account for a race between the test
// and Chrome when the window title is transitioned from the url to the title.
MATCHER_P2(TabContentsTitleEq, the_url, the_title, "") {
- const string16 url(the_url);
+ const base::string16 url(the_url);
DCHECK(!url.empty());
- const string16 title(the_title);
+ const base::string16 title(the_title);
DCHECK(!title.empty());
HWND parent = GetParent(arg);
if (parent != NULL) {
- string16 parent_title(255, L'\0');
+ base::string16 parent_title(255, L'\0');
std::ostringstream titles_found(std::string("titles found: "));
- string16 first_title;
+ base::string16 first_title;
do {
parent_title.resize(255, L'\0');
parent_title.resize(GetWindowText(parent, &parent_title[0],
« no previous file with comments | « chrome_frame/test/ie_configurator.cc ('k') | chrome_frame/test/test_scrubber.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698