Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / content_settings / permission_context_base_unittest.cc

diff --git a/src/chrome/browser/content_settings/permission_context_base_unittest.cc b/src/chrome/browser/content_settings/permission_context_base_unittest.cc
index 892aafe..51983af 100644 (file)
--- a/src/chrome/browser/content_settings/permission_context_base_unittest.cc
+++ b/src/chrome/browser/content_settings/permission_context_base_unittest.cc
@@ -5,11 +5,11 @@
 #include "chrome/browser/content_settings/permission_context_base.h"
 
 #include "base/bind.h"
-#include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/permission_queue_controller.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/content_settings/core/common/permission_request_id.h"
@@ -21,11 +21,11 @@
 class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
  protected:
   PermissionContextBaseTests() {}
-  virtual ~PermissionContextBaseTests() {}
+  ~PermissionContextBaseTests() override {}
 
  private:
   // ChromeRenderViewHostTestHarness:
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     InfoBarService::CreateForWebContents(web_contents());
   }
@@ -42,7 +42,7 @@ class TestPermissionContext : public PermissionContextBase {
      permission_granted_(false),
      tab_context_updated_(false) {}
 
-  virtual ~TestPermissionContext() {}
+  ~TestPermissionContext() override {}
 
   PermissionQueueController* GetInfoBarController() {
     return GetQueueController();
@@ -66,9 +66,9 @@ class TestPermissionContext : public PermissionContextBase {
   }
 
  protected:
-  virtual void UpdateTabContext(const PermissionRequestID& id,
-                                const GURL& requesting_origin,
-                                bool allowed) OVERRIDE {
+  void UpdateTabContext(const PermissionRequestID& id,
+                        const GURL& requesting_origin,
+                        bool allowed) override {
     tab_context_updated_ = true;
   }