Add ContentSuggestionsCategoryFactory; Store categories as ints

chrome/browser/ntp_snippets/ntp_snippets_service_factory.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ntp_snippets/ntp_snippets_service_factory.h"
 
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
@@ skipping 115 matching lines @@
               signin_manager, token_service, request_context,
               profile->GetPrefs(),
               base::Bind(&safe_json::SafeJsonParser::Parse),
               chrome::GetChannel() == version_info::Channel::STABLE),
           base::MakeUnique<ImageFetcherImpl>(
               base::MakeUnique<ImageDecoderImpl>(), request_context.get()),
           base::MakeUnique<ImageDecoderImpl>(),
           base::MakeUnique<ntp_snippets::NTPSnippetsDatabase>(database_dir,
                                                               task_runner),
           base::MakeUnique<ntp_snippets::NTPSnippetsStatusService>(
-              signin_manager, sync_service, profile->GetPrefs()));
+              signin_manager, sync_service, profile->GetPrefs()),
+          content_suggestions_service->category_factory());

[Marc Treib, 2016/07/28 11:41:45]

misaligned

[Philipp Keck, 2016/07/28 13:50:53]

That's what the formatter does and I believe it's correct. 137 starts a new
parameter to the call in 122, so it needs to be indented one more than 122, e.g.
indented as 135.

[Marc Treib, 2016/07/28 14:31:16]

Ah true, I missed a paren.
This ctor has WAY too many parameters...

 
   if (content_suggestions_service->state() ==
       ContentSuggestionsService::State::ENABLED) {
     content_suggestions_service->RegisterProvider(ntp_snippets_service);
   }
   return ntp_snippets_service;
 }