| Index: extensions/shell/app/shell_main_delegate.h
|
| diff --git a/extensions/shell/app/shell_main_delegate.h b/extensions/shell/app/shell_main_delegate.h
|
| index 7b52b22f7f5ce664da7a18846098fc7e94de1785..45ab287c6b7573f213bd44b038ee718c7efd61ab 100644
|
| --- a/extensions/shell/app/shell_main_delegate.h
|
| +++ b/extensions/shell/app/shell_main_delegate.h
|
| @@ -6,10 +6,10 @@
|
| #define EXTENSIONS_SHELL_APP_SHELL_MAIN_DELEGATE_H_
|
|
|
| #include <memory>
|
| +#include <vector>
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_vector.h"
|
| #include "build/build_config.h"
|
| #include "content/public/app/content_main_delegate.h"
|
|
|
| @@ -33,8 +33,8 @@ class ShellMainDelegate : public content::ContentMainDelegate {
|
| content::ContentRendererClient* CreateContentRendererClient() override;
|
| content::ContentUtilityClient* CreateContentUtilityClient() override;
|
| #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
| - void ZygoteStarting(
|
| - ScopedVector<content::ZygoteForkDelegate>* delegates) override;
|
| + void ZygoteStarting(std::vector<std::unique_ptr<content::ZygoteForkDelegate>>*
|
| + delegates) override;
|
| #endif
|
|
|
| protected:
|
|
|