GitLab

This reverts commit de013df9.

Reason for revert: 
Suspect causing the following failure on Linux ChromiumOS MSan Tests:
CrashRestoreComplexTest.RestoreSessionForThreeUsers:
https://logs.chromium.org/v/?s=chromium%2Fbb%2Fchromium.memory%2FLinux_ChromiumOS_MSan_Tests%2F6545%2F%2B%2Frecipes%2Fsteps%2Fbrowser_tests%2F0%2Flogs%2FCrashRestoreComplexTest.RestoreSessionForThreeUsers%2F0

  Uninitialized value was created by a heap allocation
    #0 0xa37813 in __interceptor_posix_memalign /b/build/slave/linux_upload_clang/build/src/third_party/llvm/compiler-rt/lib/msan/msan_interceptors.cc:165:3
    #1 0x1276df0f in base::AlignedAlloc(unsigned long, unsigned long) ./../../base/memory/aligned_memory.cc:31:7
    #2 0xaab5970 in Message ./../../mojo/edk/system/channel.cc:120:7
    #3 0xaab5970 in mojo::edk::Channel::Message::Message(unsigned long, unsigned long, unsigned long) ./../../mojo/edk/system/channel.cc:74:0
    #4 0xaaf24f0 in make_unique<mojo::edk::Channel::Message, unsigned long &, const unsigned long &, unsigned long &> ./../../buildtools/third_party/libc++/trunk/include/memory:3079:32
    #5 0xaaf24f0 in CreateMessage<void> ./../../mojo/edk/system/node_channel.cc:140:0
    #6 0xaaf24f0 in mojo::edk::NodeChannel::CreateEventMessage(unsigned long, unsigned long, void**, unsigned long) ./../../mojo/edk/system/node_channel.cc:182:0
    #7 0xab389d6 in mojo::edk::(anonymous namespace)::CreateOrExtendSerializedEventMessage(mojo::edk::ports::UserMessageEvent*, unsigned long, unsigned long, mojo::edk::Dispatcher::DispatcherInTransit const*, unsigned long, std::__1::unique_ptr<mojo::edk::Channel::Message, std::__1::default_delete<mojo::edk::Channel::Message> >*, void**, unsigned long*, void**) ./../../mojo/edk/system/user_message_impl.cc:144:33
    #8 0xab3bafd in mojo::edk::UserMessageImpl::AppendData(unsigned int, unsigned int const*, unsigned int) ./../../mojo/edk/system/user_message_impl.cc:465:21
    #9 0xaac2f8c in mojo::edk::Core::AppendMessageData(unsigned long, unsigned int, unsigned int const*, unsigned int, MojoAppendMessageDataOptions const*, void**, unsigned int*) ./../../mojo/edk/system/core.cc:545:16
    #10 0xaaaceb6 in MojoAppendMessageDataImpl ./../../mojo/edk/embedder/entrypoints.cc:96:18
    #11 0x176afb6a in CreateSerializedMessageObject ./../../mojo/public/cpp/bindings/lib/message.cc:93:8
    #12 0x176afb6a in mojo::Message::Message(unsigned int, unsigned int, unsigned long, unsigned long, std::__1::vector<mojo::ScopedHandleBase<mojo::Handle>, std::__1::allocator<mojo::ScopedHandleBase<mojo::Handle> > >*) ./../../mojo/public/cpp/bindings/lib/message.cc:198:0
    #13 0xe293231 in ash::mojom::AppListControllerProxy::ResolveOemFolderPosition(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, syncer::Ordinal<syncer::StringOrdinalTraits> const&, base::OnceCallback<void (mojo::StructPtr<ash::mojom::AppListItemMetadata>)>) ./gen/ash/public/interfaces/app_list.mojom.cc:1004:17
    #14 0x21340e32 in ChromeAppListModelUpdater::ResolveOemFolderPosition(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, syncer::Ordinal<syncer::StringOrdinalTraits> const&, base::OnceCallback<void (ChromeAppListItem*)>) ./../../chrome/browser/ui/app_list/chrome_app_list_model_updater.cc:372:25
    #15 0x21318489 in app_list::AppListSyncableService::ResolveFolderPositions() ./../../chrome/browser/ui/app_list/app_list_syncable_service.cc:701:21
    #16 0x21315b92 in app_list::AppListSyncableService::HandleUpdateFinished() ./../../chrome/browser/ui/app_list/app_list_syncable_service.cc:459:3
    #17 0x21311a0d in app_list::AppListSyncableService::BuildModel() ./../../chrome/browser/ui/app_list/app_list_syncable_service.cc:412:3
    #18 0x126f6624 in Run ./../../base/callback.h:95:12

Original change's description:
> Reland "app_list: merge AppListViewDelegate into AppListClientImpl in Chrome."
> 
> This is a reland of db8976b8
> 
> Original change's description:
> > app_list: merge AppListViewDelegate into AppListClientImpl in Chrome.
> >
> > This commit does a few things:
> >
> > - merges the Chrome AppListViewDelegate into AppListClientImpl;
> > - cleans up unused references;
> > - updates methods to proper accesses.
> >
> > Ownership of major classes:
> >
> > - Each user has its own AppListSyncableService, and it holds its own
> >   AppListModelUpdater, ModelBuilders, etc.
> > - There's only one AppListClientImpl in ChromeBrowserMainExtraPartsAsh
> >   shared by all users, and it holds Search classes, a mojo pointer to
> >   the AppListControllerImpl in Ash, etc.
> > - There's only one singleton AppListServiceImpl shared by all users,
> and
> >   it holds AppListControllerDelegateImpl.
> >
> > Their lifecycles:
> >
> > - Among these classes, AppListClientImpl is the first to be initiated,
> in
> >   PreProfileInit. It binds to AppListController in Ash, and then tells
> >   AppListServiceImpl two pointers (AppListController*,
> AppListClientImpl*).
> > - When AppListServiceImpl receives the two pointers, it should have
> been
> >   initiated as a singleton.
> > - The AppListClientImpl is associated with the current active user
> profile
> >   when it's accessed from AppListServiceImpl.
> >
> > Bug: 733662
> > Change-Id: Iac6de011185bf88c4b3c575871b69bd7a67c340b
> > Reviewed-on: https://chromium-review.googlesource.com/974660
> > Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
> > Commit-Queue: Jiaquan He <hejq@google.com>
> > Cr-Commit-Position: refs/heads/master@{#546247}
> 
> Bug: 733662
> Change-Id: Ia779e0ec795a9457dc7214f38b528c2dab688b90
> Reviewed-on: https://chromium-review.googlesource.com/991232
> Commit-Queue: Jiaquan He <hejq@google.com>
> Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#547956}

TBR=xiyuan@chromium.org,hejq@google.com

Change-Id: Iccc96b53a54fbc46ca02af619c9746079d1ba7f1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 733662
Reviewed-on: https://chromium-review.googlesource.com/994438Reviewed-by: Takashi Sakamoto <tasak@google.com>
Commit-Queue: Takashi Sakamoto <tasak@google.com>
Cr-Commit-Position: refs/heads/master@{#548003}