Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / storage / policy_value_store_unittest.cc

diff --git a/src/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc b/src/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc
index eea9df4..a1e02c9 100644 (file)
--- a/src/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc
+++ b/src/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc
@@ -10,12 +10,12 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
-#include "chrome/browser/extensions/api/storage/settings_observer.h"
-#include "chrome/browser/value_store/leveldb_value_store.h"
-#include "chrome/browser/value_store/value_store_unittest.h"
 #include "components/policy/core/common/external_data_fetcher.h"
 #include "components/policy/core/common/policy_map.h"
 #include "content/public/test/test_browser_thread.h"
+#include "extensions/browser/api/storage/settings_observer.h"
+#include "extensions/browser/value_store/leveldb_value_store.h"
+#include "extensions/browser/value_store/value_store_unittest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -45,31 +45,28 @@ class MutablePolicyValueStore : public PolicyValueStore {
       : PolicyValueStore(kTestExtensionId,
                          make_scoped_refptr(new SettingsObserverList()),
                          scoped_ptr<ValueStore>(new LeveldbValueStore(path))) {}
-  virtual ~MutablePolicyValueStore() {}
+  ~MutablePolicyValueStore() override {}
 
-  virtual WriteResult Set(
-      WriteOptions options,
-      const std::string& key,
-      const base::Value& value) OVERRIDE {
+  WriteResult Set(WriteOptions options,
+                  const std::string& key,
+                  const base::Value& value) override {
     return delegate()->Set(options, key, value);
   }
 
-  virtual WriteResult Set(
-      WriteOptions options, const base::DictionaryValue& values) OVERRIDE {
+  WriteResult Set(WriteOptions options,
+                  const base::DictionaryValue& values) override {
     return delegate()->Set(options, values);
   }
 
-  virtual WriteResult Remove(const std::string& key) OVERRIDE {
+  WriteResult Remove(const std::string& key) override {
     return delegate()->Remove(key);
   }
 
-  virtual WriteResult Remove(const std::vector<std::string>& keys) OVERRIDE {
+  WriteResult Remove(const std::vector<std::string>& keys) override {
     return delegate()->Remove(keys);
   }
 
-  virtual WriteResult Clear() OVERRIDE {
-    return delegate()->Clear();
-  }
+  WriteResult Clear() override { return delegate()->Clear(); }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MutablePolicyValueStore);
@@ -90,9 +87,9 @@ class PolicyValueStoreTest : public testing::Test {
  public:
   PolicyValueStoreTest()
       : file_thread_(content::BrowserThread::FILE, &loop_) {}
-  virtual ~PolicyValueStoreTest() {}
+  ~PolicyValueStoreTest() override {}
 
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir());
     observers_ = new SettingsObserverList();
     observers_->AddObserver(&observer_);
@@ -103,7 +100,7 @@ class PolicyValueStoreTest : public testing::Test {
             new LeveldbValueStore(scoped_temp_dir_.path()))));
   }
 
-  virtual void TearDown() OVERRIDE {
+  void TearDown() override {
     observers_->RemoveObserver(&observer_);
     store_.reset();
   }