| Index: athena/test/sample_activity.cc
|
| diff --git a/athena/test/sample_activity.cc b/athena/test/sample_activity.cc
|
| index 6b3713d61a56b0be386afff789a0ca11a726c2c3..02d1ca04f73234990884e3c89b93dc9a4fcb4eac 100644
|
| --- a/athena/test/sample_activity.cc
|
| +++ b/athena/test/sample_activity.cc
|
| @@ -12,7 +12,7 @@ namespace test {
|
|
|
| SampleActivity::SampleActivity(SkColor color,
|
| SkColor contents_color,
|
| - const std::string& title)
|
| + const base::string16& title)
|
| : color_(color),
|
| contents_color_(contents_color),
|
| title_(title),
|
| @@ -30,7 +30,7 @@ SkColor SampleActivity::GetRepresentativeColor() {
|
| return color_;
|
| }
|
|
|
| -std::string SampleActivity::GetTitle() {
|
| +base::string16 SampleActivity::GetTitle() {
|
| return title_;
|
| }
|
|
|
|
|