BASELINE: Update Chromium to 55.0.2883.105

And updates ninja to 1.7.2

Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

6 files changed, 1 insertions, 71 deletions

diff --git a/chromium/components/web_resource/BUILD.gn b/chromium/components/web_resource/BUILD.gn
index 02287212bec..7d4f5f4d7b2 100644
--- a/chromium/components/web_resource/BUILD.gn
+++ b/chromium/components/web_resource/BUILD.gn
@@ -6,8 +6,6 @@ static_library("web_resource") {
   sources = [
     "eula_accepted_notifier.cc",
     "eula_accepted_notifier.h",
-    "promo_resource_service.cc",
-    "promo_resource_service.h",
     "resource_request_allowed_notifier.cc",
     "resource_request_allowed_notifier.h",
     "web_resource_pref_names.cc",
diff --git a/chromium/components/web_resource/promo_resource_service.cc b/chromium/components/web_resource/promo_resource_service.cc
deleted file mode 100644
index dbefc3037ae..00000000000
--- a/chromium/components/web_resource/promo_resource_service.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) 2012 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 "components/web_resource/promo_resource_service.h"
-
-#include "components/prefs/pref_registry_simple.h"
-#include "components/prefs/pref_service.h"
-#include "components/web_resource/web_resource_pref_names.h"
-
-namespace web_resource {
-
-static const char kPrefPromoObject[] = "promo";
-
-// static
-void PromoResourceService::RegisterPrefs(PrefRegistrySimple* registry) {
-  registry->RegisterStringPref(prefs::kNtpPromoResourceCacheUpdate, "0");
-  registry->RegisterDictionaryPref(kPrefPromoObject);
-}
-
-// static
-void PromoResourceService::ClearLocalState(PrefService* local_state) {
-  local_state->ClearPref(prefs::kNtpPromoResourceCacheUpdate);
-  local_state->ClearPref(kPrefPromoObject);
-}
-
-PromoResourceService::PromoResourceService() {}
-
-PromoResourceService::~PromoResourceService() {}
-
-}  // namespace web_resource
diff --git a/chromium/components/web_resource/promo_resource_service.h b/chromium/components/web_resource/promo_resource_service.h
deleted file mode 100644
index 83ef9ddfdf2..00000000000
--- a/chromium/components/web_resource/promo_resource_service.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2012 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.
-
-#ifndef COMPONENTS_WEB_RESOURCE_PROMO_RESOURCE_SERVICE_H_
-#define COMPONENTS_WEB_RESOURCE_PROMO_RESOURCE_SERVICE_H_
-
-#include <stdint.h>
-
-#include "base/macros.h"
-
-class PrefRegistrySimple;
-class PrefService;
-
-namespace web_resource {
-
-// This class is being removed <https://crbug.com/576772>. It currently only
-// exists to delete its old preferences.
-class PromoResourceService {
- public:
-  static void RegisterPrefs(PrefRegistrySimple* registry);
-  static void ClearLocalState(PrefService* local_state);
-
- private:
-  PromoResourceService();
-  ~PromoResourceService();
-
-  DISALLOW_COPY_AND_ASSIGN(PromoResourceService);
-};
-
-}  // namespace web_resource
-
-#endif  // COMPONENTS_WEB_RESOURCE_PROMO_RESOURCE_SERVICE_H_
diff --git a/chromium/components/web_resource/web_resource_pref_names.cc b/chromium/components/web_resource/web_resource_pref_names.cc
index 51ae76f570b..5fb4df7fb36 100644
--- a/chromium/components/web_resource/web_resource_pref_names.cc
+++ b/chromium/components/web_resource/web_resource_pref_names.cc
@@ -9,7 +9,4 @@ namespace prefs {
 // A boolean pref of the EULA accepted flag.
 const char kEulaAccepted[] = "EulaAccepted";
 
-// Last time of update of promo_resource_cache.
-const char kNtpPromoResourceCacheUpdate[] = "ntp.promo_resource_cache_update";
-
 }  // namespace prefs
diff --git a/chromium/components/web_resource/web_resource_pref_names.h b/chromium/components/web_resource/web_resource_pref_names.h
index 0fa4f43789b..5aad2b61c6e 100644
--- a/chromium/components/web_resource/web_resource_pref_names.h
+++ b/chromium/components/web_resource/web_resource_pref_names.h
@@ -8,7 +8,6 @@
 namespace prefs {
 
 extern const char kEulaAccepted[];
-extern const char kNtpPromoResourceCacheUpdate[];
 
 }  // namespace prefs
 
diff --git a/chromium/components/web_resource/web_resource_service.cc b/chromium/components/web_resource/web_resource_service.cc
index 6e05d4159c1..544b9d8809e 100644
--- a/chromium/components/web_resource/web_resource_service.cc
+++ b/chromium/components/web_resource/web_resource_service.cc
@@ -79,7 +79,7 @@ void WebResourceService::OnURLFetchComplete(const net::URLFetcher* source) {
     // (on Android in particular) we short-cut the full parsing in the case of
     // trivially "empty" JSONs.
     if (data.empty() || data == "{}") {
-      OnUnpackFinished(base::WrapUnique(new base::DictionaryValue()));
+      OnUnpackFinished(base::MakeUnique<base::DictionaryValue>());
     } else {
       parse_json_callback_.Run(data,
                                base::Bind(&WebResourceService::OnUnpackFinished,