| Index: extensions/common/manifest_handler_unittest.cc
|
| diff --git a/extensions/common/manifest_handler_unittest.cc b/extensions/common/manifest_handler_unittest.cc
|
| index 9a3a29298b2e6c4f42d3ef068e5b166fc0e564ee..8eb9fec94cfc50bad77a9831cba2ecd363781f99 100644
|
| --- a/extensions/common/manifest_handler_unittest.cc
|
| +++ b/extensions/common/manifest_handler_unittest.cc
|
| @@ -83,7 +83,7 @@ class ManifestHandlerTest : public testing::Test {
|
| : name_(name), keys_(keys), prereqs_(prereqs), watcher_(watcher) {
|
| }
|
|
|
| - virtual bool Parse(Extension* extension, string16* error) OVERRIDE {
|
| + virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE {
|
| watcher_->Record(name_);
|
| return true;
|
| }
|
| @@ -111,7 +111,7 @@ class ManifestHandlerTest : public testing::Test {
|
| ParsingWatcher* watcher)
|
| : TestManifestHandler(name, keys, prereqs, watcher) {
|
| }
|
| - virtual bool Parse(Extension* extension, string16* error) OVERRIDE {
|
| + virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE {
|
| *error = ASCIIToUTF16(name_);
|
| return false;
|
| }
|
| @@ -141,7 +141,7 @@ class ManifestHandlerTest : public testing::Test {
|
| keys_(keys) {
|
| }
|
|
|
| - virtual bool Parse(Extension* extension, string16* error) OVERRIDE {
|
| + virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE {
|
| return true;
|
| }
|
|
|
|
|