Uses string16 for ActivityViewModel::GetTitle()

athena/test/sample_activity.h

Index: athena/test/sample_activity.h
diff --git a/athena/test/sample_activity.h b/athena/test/sample_activity.h
index 04745a51d73a24420d628715e53220bda3a77478..007a249ac39df5d047446e46e084ddf40bc96a5e 100644
--- a/athena/test/sample_activity.h
+++ b/athena/test/sample_activity.h
@@ -17,7 +17,7 @@ class SampleActivity : public Activity,
  public:
   SampleActivity(SkColor color,
                  SkColor contents_color,
-                 const std::string& title);
+                 const base::string16& title);
   virtual ~SampleActivity();
 
  private:
@@ -26,12 +26,12 @@ class SampleActivity : public Activity,
 
   // athena::ActivityViewModel:
   virtual SkColor GetRepresentativeColor() OVERRIDE;
-  virtual std::string GetTitle() OVERRIDE;
+  virtual base::string16 GetTitle() OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
 
   SkColor color_;
   SkColor contents_color_;
-  std::string title_;
+  base::string16 title_;
   views::View* contents_view_;
 
   DISALLOW_COPY_AND_ASSIGN(SampleActivity);