| Index: chrome/app/chrome_main_delegate.h
|
| diff --git a/chrome/app/chrome_main_delegate.h b/chrome/app/chrome_main_delegate.h
|
| index 278858c4e2fb4fdeba218977bfd34cd1eb6f3890..5af397beae7cc3204592e7ed3b1a6b603f6eb5c0 100644
|
| --- a/chrome/app/chrome_main_delegate.h
|
| +++ b/chrome/app/chrome_main_delegate.h
|
| @@ -6,6 +6,7 @@
|
| #define CHROME_APP_CHROME_MAIN_DELEGATE_H_
|
|
|
| #include <memory>
|
| +#include <vector>
|
|
|
| #include "base/macros.h"
|
| #include "base/time/time.h"
|
| @@ -13,9 +14,6 @@
|
| #include "chrome/common/chrome_content_client.h"
|
| #include "content/public/app/content_main_delegate.h"
|
|
|
| -template <typename>
|
| -class ScopedVector;
|
| -
|
| namespace base {
|
| class CommandLine;
|
| }
|
| @@ -45,8 +43,8 @@ class ChromeMainDelegate : public content::ContentMainDelegate {
|
| bool ShouldSendMachPort(const std::string& process_type) override;
|
| bool DelaySandboxInitialization(const std::string& process_type) override;
|
| #elif defined(OS_POSIX) && !defined(OS_ANDROID)
|
| - void ZygoteStarting(
|
| - ScopedVector<content::ZygoteForkDelegate>* delegates) override;
|
| + void ZygoteStarting(std::vector<std::unique_ptr<content::ZygoteForkDelegate>>*
|
| + delegates) override;
|
| void ZygoteForked() override;
|
| #endif
|
| bool ShouldEnableProfilerRecording() override;
|
|
|