| Index: athena/test/sample_activity_factory.cc
|
| diff --git a/athena/test/sample_activity_factory.cc b/athena/test/sample_activity_factory.cc
|
| index 8fb0bd25175b09a4f9f9900d0acf7e13cb19d8e7..d7444ebc40e44fe995ac10e96b4637e7ca6b0351 100644
|
| --- a/athena/test/sample_activity_factory.cc
|
| +++ b/athena/test/sample_activity_factory.cc
|
| @@ -36,15 +36,6 @@ Activity* SampleActivityFactory::CreateWebActivity(
|
| }
|
|
|
| Activity* SampleActivityFactory::CreateAppActivity(
|
| - extensions::ShellAppWindow* app_window,
|
| - const std::string& app_id) {
|
| - // SampleActivityFactory can't own the |app_window|, so it must be NULL.
|
| - DCHECK(app_window == NULL);
|
| - return new SampleActivity(
|
| - kDefaultAppColor, kDefaultAppContentColor, base::UTF8ToUTF16("App"));
|
| -}
|
| -
|
| -Activity* SampleActivityFactory::CreateAppActivity(
|
| extensions::AppWindow* app_window,
|
| views::WebView* web_view) {
|
| DCHECK(!web_view);
|
|
|