diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/components/login | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
| download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/components/login')
4 files changed, 11 insertions, 12 deletions
diff --git a/chromium/components/login/OWNERS b/chromium/components/login/OWNERS index 4492b2007dc..7eafe555026 100644 --- a/chromium/components/login/OWNERS +++ b/chromium/components/login/OWNERS @@ -1,7 +1,5 @@ +achuith@chromium.org alemate@chromium.org -antrim@chromium.org -davemoore@chromium.org dzhioev@chromium.org -nkostylev@chromium.org piman@chromium.org -achuith@chromium.org +xiyuan@chromium.org diff --git a/chromium/components/login/screens/screen_context.cc b/chromium/components/login/screens/screen_context.cc index fa253fc00e4..37a307ec3b6 100644 --- a/chromium/components/login/screens/screen_context.cc +++ b/chromium/components/login/screens/screen_context.cc @@ -4,8 +4,9 @@ #include "components/login/screens/screen_context.h" +#include <memory> + #include "base/logging.h" -#include "base/memory/scoped_ptr.h" namespace login { @@ -123,8 +124,8 @@ String16List ScreenContext::GetString16List( } void ScreenContext::CopyFrom(ScreenContext& context) { - scoped_ptr<base::DictionaryValue> storage(context.storage_.DeepCopy()); - scoped_ptr<base::DictionaryValue> changes(context.changes_.DeepCopy()); + std::unique_ptr<base::DictionaryValue> storage(context.storage_.DeepCopy()); + std::unique_ptr<base::DictionaryValue> changes(context.changes_.DeepCopy()); storage_.Swap(storage.get()); changes_.Swap(changes.get()); } @@ -166,7 +167,7 @@ void ScreenContext::ApplyChanges(const base::DictionaryValue& diff, bool ScreenContext::Set(const KeyType& key, base::Value* value) { DCHECK(CalledOnValidThread()); DCHECK(value); - scoped_ptr<base::Value> new_value(value); + std::unique_ptr<base::Value> new_value(value); base::Value* current_value; bool in_storage = storage_.Get(key, ¤t_value); diff --git a/chromium/components/login/screens/screen_context.h b/chromium/components/login/screens/screen_context.h index 0fb4b85abec..e7ae775d018 100644 --- a/chromium/components/login/screens/screen_context.h +++ b/chromium/components/login/screens/screen_context.h @@ -11,7 +11,6 @@ #include "base/logging.h" #include "base/macros.h" #include "base/memory/linked_ptr.h" -#include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/threading/non_thread_safe.h" #include "base/values.h" diff --git a/chromium/components/login/screens/screen_context_unittest.cc b/chromium/components/login/screens/screen_context_unittest.cc index c6a75b164d4..2e5a569e7dc 100644 --- a/chromium/components/login/screens/screen_context_unittest.cc +++ b/chromium/components/login/screens/screen_context_unittest.cc @@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "components/login/screens/screen_context.h" + #include <algorithm> +#include <memory> #include <vector> -#include "base/memory/scoped_ptr.h" -#include "components/login/screens/screen_context.h" #include "testing/gtest/include/gtest/gtest.h" namespace login { @@ -24,7 +25,7 @@ class ScreenContextTest : public testing::Test { ScreenContext& context() { return *context_.get(); } private: - scoped_ptr<ScreenContext> context_; + std::unique_ptr<ScreenContext> context_; }; TEST_F(ScreenContextTest, Simple) { |