diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 17:35:57 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 17:35:57 +0000 |
| commit | 4a856bd7d23d27153ff8a5c5d943edd74bd155a6 (patch) | |
| tree | 0af75b7c8af0c2ea6de2851a75e9f3a8da7e6efa /chrome_frame/test/mock_ie_event_sink_actions.h | |
| parent | 4dcc2ec6b1a9417aab85183acbca64761ccdd32d (diff) | |
| download | chromium_src-4a856bd7d23d27153ff8a5c5d943edd74bd155a6.zip chromium_src-4a856bd7d23d27153ff8a5c5d943edd74bd155a6.tar.gz chromium_src-4a856bd7d23d27153ff8a5c5d943edd74bd155a6.tar.bz2 | |
Add base:: to string16 in chrome_frame/.
R=grt@chromium.org
BUG=329295
Review URL: https://codereview.chromium.org/113143006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/mock_ie_event_sink_actions.h')
| -rw-r--r-- | chrome_frame/test/mock_ie_event_sink_actions.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/test/mock_ie_event_sink_actions.h b/chrome_frame/test/mock_ie_event_sink_actions.h index 9aa57a1..ff13a7f 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], |