BASELINE: Update Chromium to 51.0.2704.41

Also adds in all smaller components by reversing logic for exclusion.

Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

15 files changed, 32 insertions, 22 deletions

diff --git a/chromium/components/user_prefs/BUILD.gn b/chromium/components/user_prefs/BUILD.gn
index 3d777d23325..ed09b2dad6a 100644
--- a/chromium/components/user_prefs/BUILD.gn
+++ b/chromium/components/user_prefs/BUILD.gn
@@ -13,6 +13,6 @@ component("user_prefs") {
 
   deps = [
     "//base",
-    "//base:prefs",
+    "//components/prefs",
   ]
 }
diff --git a/chromium/components/user_prefs/DEPS b/chromium/components/user_prefs/DEPS
index 9ca65e36d8e..4adeae9aa95 100644
--- a/chromium/components/user_prefs/DEPS
+++ b/chromium/components/user_prefs/DEPS
@@ -3,4 +3,6 @@ include_rules = [
   # platform-specific dependencies.
   "-content",
   "-ios",
+
+  "+components/prefs",
 ]
diff --git a/chromium/components/user_prefs/tracked/BUILD.gn b/chromium/components/user_prefs/tracked/BUILD.gn
index 25fc09c4baa..8a855eebf51 100644
--- a/chromium/components/user_prefs/tracked/BUILD.gn
+++ b/chromium/components/user_prefs/tracked/BUILD.gn
@@ -54,8 +54,8 @@ static_library("user_prefs_tracked") {
 
   deps = [
     "//base:base",
-    "//base:prefs",
     "//components/pref_registry",
+    "//components/prefs",
     "//crypto:crypto",
   ]
 }
@@ -89,8 +89,7 @@ source_set("unit_tests") {
     ":user_prefs_tracked",
     ":user_prefs_tracked_test_support",
     "//base:base",
-    "//base:prefs",
-    "//base:prefs_test_support",
+    "//components/prefs:test_support",
     "//testing/gtest",
   ]
 }
diff --git a/chromium/components/user_prefs/tracked/dictionary_hash_store_contents.cc b/chromium/components/user_prefs/tracked/dictionary_hash_store_contents.cc
index 40494afeb8e..403437b62c2 100644
--- a/chromium/components/user_prefs/tracked/dictionary_hash_store_contents.cc
+++ b/chromium/components/user_prefs/tracked/dictionary_hash_store_contents.cc
@@ -7,9 +7,9 @@
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/prefs/persistent_pref_store.h"
 #include "base/values.h"
 #include "components/pref_registry/pref_registry_syncable.h"
+#include "components/prefs/persistent_pref_store.h"
 
 namespace {
 
diff --git a/chromium/components/user_prefs/tracked/interceptable_pref_filter.h b/chromium/components/user_prefs/tracked/interceptable_pref_filter.h
index 58021df319c..ae39d02c156 100644
--- a/chromium/components/user_prefs/tracked/interceptable_pref_filter.h
+++ b/chromium/components/user_prefs/tracked/interceptable_pref_filter.h
@@ -7,8 +7,8 @@
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
-#include "base/prefs/pref_filter.h"
 #include "base/values.h"
+#include "components/prefs/pref_filter.h"
 
 // A partial implementation of a PrefFilter whose FilterOnLoad call may be
 // intercepted by a FilterOnLoadInterceptor. Implementations of
diff --git a/chromium/components/user_prefs/tracked/pref_hash_calculator.cc b/chromium/components/user_prefs/tracked/pref_hash_calculator.cc
index 9e7a0d0d48e..2099121b11d 100644
--- a/chromium/components/user_prefs/tracked/pref_hash_calculator.cc
+++ b/chromium/components/user_prefs/tracked/pref_hash_calculator.cc
@@ -11,6 +11,7 @@
 #include "base/bind.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
diff --git a/chromium/components/user_prefs/tracked/pref_hash_filter.cc b/chromium/components/user_prefs/tracked/pref_hash_filter.cc
index f77aaedd6e5..a9b41835f7b 100644
--- a/chromium/components/user_prefs/tracked/pref_hash_filter.cc
+++ b/chromium/components/user_prefs/tracked/pref_hash_filter.cc
@@ -11,12 +11,12 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/metrics/histogram.h"
-#include "base/prefs/pref_service.h"
-#include "base/prefs/pref_store.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "components/pref_registry/pref_registry_syncable.h"
+#include "components/prefs/pref_service.h"
+#include "components/prefs/pref_store.h"
 #include "components/user_prefs/tracked/dictionary_hash_store_contents.h"
 #include "components/user_prefs/tracked/pref_hash_store.h"
 #include "components/user_prefs/tracked/pref_hash_store_transaction.h"
@@ -36,6 +36,8 @@ void CleanupDeprecatedTrackedPreferences(
       "safebrowsing.incident_report_sent",
       // TODO(mad): Remove in M48+.
       "software_reporter.prompt_reason",
+      // TODO(zea): Remove in M52+,
+      "sync.remaining_rollback_tries"
   };
 
   for (size_t i = 0; i < arraysize(kDeprecatedTrackedPreferences); ++i) {
diff --git a/chromium/components/user_prefs/tracked/pref_hash_filter_unittest.cc b/chromium/components/user_prefs/tracked/pref_hash_filter_unittest.cc
index 9eceefcb1a7..adf2bf3613e 100644
--- a/chromium/components/user_prefs/tracked/pref_hash_filter_unittest.cc
+++ b/chromium/components/user_prefs/tracked/pref_hash_filter_unittest.cc
@@ -22,8 +22,8 @@
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
-#include "base/prefs/testing_pref_store.h"
 #include "base/values.h"
+#include "components/prefs/testing_pref_store.h"
 #include "components/user_prefs/tracked/hash_store_contents.h"
 #include "components/user_prefs/tracked/mock_validation_delegate.h"
 #include "components/user_prefs/tracked/pref_hash_store.h"
diff --git a/chromium/components/user_prefs/tracked/pref_service_hash_store_contents.cc b/chromium/components/user_prefs/tracked/pref_service_hash_store_contents.cc
index 122fa472413..8f8329ec4c4 100644
--- a/chromium/components/user_prefs/tracked/pref_service_hash_store_contents.cc
+++ b/chromium/components/user_prefs/tracked/pref_service_hash_store_contents.cc
@@ -4,10 +4,10 @@
 
 #include "components/user_prefs/tracked/pref_service_hash_store_contents.h"
 
-#include "base/prefs/pref_registry_simple.h"
-#include "base/prefs/pref_service.h"
-#include "base/prefs/scoped_user_pref_update.h"
 #include "base/values.h"
+#include "components/prefs/pref_registry_simple.h"
+#include "components/prefs/pref_service.h"
+#include "components/prefs/scoped_user_pref_update.h"
 
 namespace {
 
diff --git a/chromium/components/user_prefs/tracked/pref_service_hash_store_contents_unittest.cc b/chromium/components/user_prefs/tracked/pref_service_hash_store_contents_unittest.cc
index 09003d9ecdd..3cfb10542af 100644
--- a/chromium/components/user_prefs/tracked/pref_service_hash_store_contents_unittest.cc
+++ b/chromium/components/user_prefs/tracked/pref_service_hash_store_contents_unittest.cc
@@ -6,9 +6,9 @@
 
 #include <string>
 
-#include "base/prefs/pref_service.h"
-#include "base/prefs/testing_pref_service.h"
 #include "base/values.h"
+#include "components/prefs/pref_service.h"
+#include "components/prefs/testing_pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class PrefServiceHashStoreContentsTest : public testing::Test {
diff --git a/chromium/components/user_prefs/tracked/segregated_pref_store.cc b/chromium/components/user_prefs/tracked/segregated_pref_store.cc
index 177736cf29e..7f5453fe4a5 100644
--- a/chromium/components/user_prefs/tracked/segregated_pref_store.cc
+++ b/chromium/components/user_prefs/tracked/segregated_pref_store.cc
@@ -156,6 +156,10 @@ void SegregatedPrefStore::SchedulePendingLossyWrites() {
   selected_pref_store_->SchedulePendingLossyWrites();
 }
 
+void SegregatedPrefStore::ClearMutableValues() {
+  NOTIMPLEMENTED();
+}
+
 SegregatedPrefStore::~SegregatedPrefStore() {
   default_pref_store_->RemoveObserver(&aggregating_observer_);
   selected_pref_store_->RemoveObserver(&aggregating_observer_);
diff --git a/chromium/components/user_prefs/tracked/segregated_pref_store.h b/chromium/components/user_prefs/tracked/segregated_pref_store.h
index c1960c07e2e..2f52f01ce77 100644
--- a/chromium/components/user_prefs/tracked/segregated_pref_store.h
+++ b/chromium/components/user_prefs/tracked/segregated_pref_store.h
@@ -15,7 +15,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
-#include "base/prefs/persistent_pref_store.h"
+#include "components/prefs/persistent_pref_store.h"
 
 // Provides a unified PersistentPrefStore implementation that splits its storage
 // and retrieval between two underlying PersistentPrefStore instances: a set of
@@ -72,6 +72,8 @@ class SegregatedPrefStore : public PersistentPrefStore {
   void CommitPendingWrite() override;
   void SchedulePendingLossyWrites() override;
 
+  void ClearMutableValues() override;
+
  private:
   // Aggregates events from the underlying stores and synthesizes external
   // events via |on_initialization|, |read_error_delegate_|, and |observers_|.
diff --git a/chromium/components/user_prefs/tracked/segregated_pref_store_unittest.cc b/chromium/components/user_prefs/tracked/segregated_pref_store_unittest.cc
index 1986758c1f3..da8df8fa1a8 100644
--- a/chromium/components/user_prefs/tracked/segregated_pref_store_unittest.cc
+++ b/chromium/components/user_prefs/tracked/segregated_pref_store_unittest.cc
@@ -12,10 +12,10 @@
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/prefs/persistent_pref_store.h"
-#include "base/prefs/pref_store_observer_mock.h"
-#include "base/prefs/testing_pref_store.h"
 #include "base/values.h"
+#include "components/prefs/persistent_pref_store.h"
+#include "components/prefs/pref_store_observer_mock.h"
+#include "components/prefs/testing_pref_store.h"
 #include "components/user_prefs/tracked/segregated_pref_store.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chromium/components/user_prefs/tracked/tracked_preferences_migration_unittest.cc b/chromium/components/user_prefs/tracked/tracked_preferences_migration_unittest.cc
index 4c837f99dfb..f6e380dde9a 100644
--- a/chromium/components/user_prefs/tracked/tracked_preferences_migration_unittest.cc
+++ b/chromium/components/user_prefs/tracked/tracked_preferences_migration_unittest.cc
@@ -13,9 +13,9 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/prefs/testing_pref_service.h"
 #include "base/strings/string_split.h"
 #include "base/values.h"
+#include "components/prefs/testing_pref_service.h"
 #include "components/user_prefs/tracked/dictionary_hash_store_contents.h"
 #include "components/user_prefs/tracked/hash_store_contents.h"
 #include "components/user_prefs/tracked/interceptable_pref_filter.h"
@@ -293,9 +293,9 @@ class TrackedPreferencesMigrationTest : public testing::Test {
   bool HasPrefs(MockPrefStoreID store_id) {
     switch (store_id) {
       case MOCK_UNPROTECTED_PREF_STORE:
-        return unprotected_prefs_;
+        return !!unprotected_prefs_;
       case MOCK_PROTECTED_PREF_STORE:
-        return protected_prefs_;
+        return !!protected_prefs_;
     }
     NOTREACHED();
     return false;
diff --git a/chromium/components/user_prefs/user_prefs.cc b/chromium/components/user_prefs/user_prefs.cc
index 3ddff9bfc10..493c50eac77 100644
--- a/chromium/components/user_prefs/user_prefs.cc
+++ b/chromium/components/user_prefs/user_prefs.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
-#include "base/prefs/pref_service.h"
+#include "components/prefs/pref_service.h"
 
 namespace user_prefs {