BASELINE: Update Chromium to 57.0.2987.144

Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

4 files changed, 10 insertions, 12 deletions

diff --git a/chromium/net/extras/sqlite/sqlite_channel_id_store.cc b/chromium/net/extras/sqlite/sqlite_channel_id_store.cc
index 238577fd18d..ebcf7ec74ba 100644
--- a/chromium/net/extras/sqlite/sqlite_channel_id_store.cc
+++ b/chromium/net/extras/sqlite/sqlite_channel_id_store.cc
@@ -227,8 +227,7 @@ void SQLiteChannelIDStore::Backend::LoadInBackground(
     smt.ColumnBlobAsVector(2, &public_key_from_db);
     std::unique_ptr<crypto::ECPrivateKey> key(
         crypto::ECPrivateKey::CreateFromEncryptedPrivateKeyInfo(
-            ChannelIDService::kEPKIPassword, private_key_from_db,
-            public_key_from_db));
+            private_key_from_db, public_key_from_db));
     if (!key)
       continue;
     std::unique_ptr<DefaultChannelIDStore::ChannelID> channel_id(
@@ -498,8 +497,7 @@ void SQLiteChannelIDStore::Backend::Commit() {
         add_statement.Reset(true);
         add_statement.BindString(0, po->channel_id().server_identifier());
         std::vector<uint8_t> private_key, public_key;
-        if (!po->channel_id().key()->ExportEncryptedPrivateKey(
-                ChannelIDService::kEPKIPassword, 1, &private_key))
+        if (!po->channel_id().key()->ExportEncryptedPrivateKey(&private_key))
           continue;
         if (!po->channel_id().key()->ExportPublicKey(&public_key))
           continue;
diff --git a/chromium/net/extras/sqlite/sqlite_channel_id_store.h b/chromium/net/extras/sqlite/sqlite_channel_id_store.h
index fc85458c43e..9a5901d293a 100644
--- a/chromium/net/extras/sqlite/sqlite_channel_id_store.h
+++ b/chromium/net/extras/sqlite/sqlite_channel_id_store.h
@@ -19,8 +19,6 @@ class FilePath;
 class SequencedTaskRunner;
 }
 
-class GURL;
-
 namespace net {
 
 // Implements the DefaultChannelIDStore::PersistentStore interface
diff --git a/chromium/net/extras/sqlite/sqlite_channel_id_store_unittest.cc b/chromium/net/extras/sqlite/sqlite_channel_id_store_unittest.cc
index 8be7a4b5f03..7c9b223e3e1 100644
--- a/chromium/net/extras/sqlite/sqlite_channel_id_store_unittest.cc
+++ b/chromium/net/extras/sqlite/sqlite_channel_id_store_unittest.cc
@@ -65,8 +65,8 @@ class SQLiteChannelIDStoreTest : public testing::Test {
     ASSERT_TRUE(asn1::ExtractSPKIFromDERCert(*cert_data, &spki));
     std::vector<uint8_t> public_key(spki.size());
     memcpy(public_key.data(), spki.data(), spki.size());
-    *key = crypto::ECPrivateKey::CreateFromEncryptedPrivateKeyInfo(
-        ChannelIDService::kEPKIPassword, private_key, public_key);
+    *key = crypto::ECPrivateKey::CreateFromEncryptedPrivateKeyInfo(private_key,
+                                                                   public_key);
   }
 
   static base::Time GetTestCertExpirationTime() {
@@ -84,7 +84,9 @@ class SQLiteChannelIDStoreTest : public testing::Test {
     exploded_time.minute = 22;
     exploded_time.second = 39;
     exploded_time.millisecond = 0;
-    return base::Time::FromUTCExploded(exploded_time);
+    base::Time out_time;
+    EXPECT_TRUE(base::Time::FromUTCExploded(exploded_time, &out_time));
+    return out_time;
   }
 
   static base::Time GetTestCertCreationTime() {
@@ -98,7 +100,9 @@ class SQLiteChannelIDStoreTest : public testing::Test {
     exploded_time.minute = 22;
     exploded_time.second = 39;
     exploded_time.millisecond = 0;
-    return base::Time::FromUTCExploded(exploded_time);
+    base::Time out_time;
+    EXPECT_TRUE(base::Time::FromUTCExploded(exploded_time, &out_time));
+    return out_time;
   }
 
   void SetUp() override {
diff --git a/chromium/net/extras/sqlite/sqlite_persistent_cookie_store.h b/chromium/net/extras/sqlite/sqlite_persistent_cookie_store.h
index b8c1caad5eb..6350457d37d 100644
--- a/chromium/net/extras/sqlite/sqlite_persistent_cookie_store.h
+++ b/chromium/net/extras/sqlite/sqlite_persistent_cookie_store.h
@@ -15,8 +15,6 @@
 #include "base/memory/ref_counted.h"
 #include "net/cookies/cookie_monster.h"
 
-class Task;
-
 namespace base {
 class FilePath;
 class SequencedTaskRunner;