Use base namespace for string16 in chrome/browser.

This converts 200 more files.

TBR=sky

Review URL: https://codereview.chromium.org/108353004

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

1 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/ui/toolbar/test_toolbar_model.h b/chrome/browser/ui/toolbar/test_toolbar_model.h
index 79887c5..40261e2 100644
--- a/chrome/browser/ui/toolbar/test_toolbar_model.h
+++ b/chrome/browser/ui/toolbar/test_toolbar_model.h
@@ -16,17 +16,17 @@ class TestToolbarModel : public ToolbarModel {
  public:
   TestToolbarModel();
   virtual ~TestToolbarModel();
-  virtual string16 GetText() const OVERRIDE;
-  virtual string16 GetCorpusNameForMobile() const OVERRIDE;
+  virtual base::string16 GetText() const OVERRIDE;
+  virtual base::string16 GetCorpusNameForMobile() const OVERRIDE;
   virtual GURL GetURL() const OVERRIDE;
   virtual bool WouldPerformSearchTermReplacement(
       bool ignore_editing) const OVERRIDE;
   virtual SecurityLevel GetSecurityLevel(bool ignore_editing) const OVERRIDE;
   virtual int GetIcon() const OVERRIDE;
-  virtual string16 GetEVCertName() const OVERRIDE;
+  virtual base::string16 GetEVCertName() const OVERRIDE;
   virtual bool ShouldDisplayURL() const OVERRIDE;
 
-  void set_text(const string16& text) { text_ = text; }
+  void set_text(const base::string16& text) { text_ = text; }
   void set_url(const GURL& url) { url_ = url;}
   void set_replace_search_url_with_search_terms(bool should_replace_url) {
     should_replace_url_ = should_replace_url;
@@ -35,7 +35,7 @@ class TestToolbarModel : public ToolbarModel {
     security_level_ = security_level;
   }
   void set_icon(int icon) { icon_ = icon; }
-  void set_ev_cert_name(const string16& ev_cert_name) {
+  void set_ev_cert_name(const base::string16& ev_cert_name) {
     ev_cert_name_ = ev_cert_name;
   }
   void set_should_display_url(bool should_display_url) {
@@ -43,12 +43,12 @@ class TestToolbarModel : public ToolbarModel {
   }
 
  private:
-  string16 text_;
+  base::string16 text_;
   GURL url_;
   bool should_replace_url_;
   SecurityLevel security_level_;
   int icon_;
-  string16 ev_cert_name_;
+  base::string16 ev_cert_name_;
   bool should_display_url_;
 
   DISALLOW_COPY_AND_ASSIGN(TestToolbarModel);