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

Unified Diff: content/public/test/browser_test_utils.h

Issue 102593002: Convert string16 to base::string16 in content. (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 | « content/public/renderer/render_view.h ('k') | content/public/test/browser_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/browser_test_utils.h
diff --git a/content/public/test/browser_test_utils.h b/content/public/test/browser_test_utils.h
index 53b40ec54f8b7ea8c41a6b1907726a269d0e77bc..510e80985a1b731173e8ca5782cd766c7f130988 100644
--- a/content/public/test/browser_test_utils.h
+++ b/content/public/test/browser_test_utils.h
@@ -196,16 +196,16 @@ class TitleWatcher : public WebContentsObserver {
// entire lifetime of |this|. |expected_title| is the title that |this|
// will wait for.
TitleWatcher(WebContents* web_contents,
- const string16& expected_title);
+ const base::string16& expected_title);
virtual ~TitleWatcher();
// Adds another title to watch for.
- void AlsoWaitForTitle(const string16& expected_title);
+ void AlsoWaitForTitle(const base::string16& expected_title);
// Waits until the title matches either expected_title or one of the titles
// added with AlsoWaitForTitle. Returns the value of the most recently
// observed matching title.
- const string16& WaitAndGetTitle() WARN_UNUSED_RESULT;
+ const base::string16& WaitAndGetTitle() WARN_UNUSED_RESULT;
private:
// Overridden WebContentsObserver methods.
@@ -214,11 +214,11 @@ class TitleWatcher : public WebContentsObserver {
void TestTitle();
- std::vector<string16> expected_titles_;
+ std::vector<base::string16> expected_titles_;
scoped_refptr<MessageLoopRunner> message_loop_runner_;
// The most recently observed expected title, if any.
- string16 observed_title_;
+ base::string16 observed_title_;
DISALLOW_COPY_AND_ASSIGN(TitleWatcher);
};
« no previous file with comments | « content/public/renderer/render_view.h ('k') | content/public/test/browser_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698