Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / browsing_data / cookies_tree_model_unittest.cc

diff --git a/src/chrome/browser/browsing_data/cookies_tree_model_unittest.cc b/src/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
index 3e2f6db..4f096de 100644 (file)
--- a/src/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
+++ b/src/chrome/browser/browsing_data/cookies_tree_model_unittest.cc
@@ -20,9 +20,10 @@
 #include "chrome/browser/browsing_data/mock_browsing_data_quota_helper.h"
 #include "chrome/browser/browsing_data/mock_browsing_data_service_worker_helper.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
-#include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/mock_settings_observer.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/content_settings/core/browser/host_content_settings_map.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/test/test_browser_thread_bundle.h"
@@ -41,7 +42,7 @@ namespace {
 
 class CookiesTreeModelTest : public testing::Test {
  public:
-  virtual ~CookiesTreeModelTest() {
+  ~CookiesTreeModelTest() override {
     // Avoid memory leaks.
 #if defined(ENABLE_EXTENSIONS)
     special_storage_policy_ = NULL;
@@ -50,7 +51,7 @@ class CookiesTreeModelTest : public testing::Test {
     base::MessageLoop::current()->RunUntilIdle();
   }
 
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     profile_.reset(new TestingProfile());
     mock_browsing_data_cookie_helper_ =
         new MockBrowsingDataCookieHelper(profile_->GetRequestContext());
@@ -84,7 +85,7 @@ class CookiesTreeModelTest : public testing::Test {
 #endif
   }
 
-  virtual void TearDown() OVERRIDE {
+  void TearDown() override {
     mock_browsing_data_service_worker_helper_ = NULL;
     mock_browsing_data_channel_id_helper_ = NULL;
     mock_browsing_data_quota_helper_ = NULL;