Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / shell / browser / shell_browser_context.cc

diff --git a/src/content/shell/browser/shell_browser_context.cc b/src/content/shell/browser/shell_browser_context.cc
index ed94d3c..9b0003b 100644 (file)
--- a/src/content/shell/browser/shell_browser_context.cc
+++ b/src/content/shell/browser/shell_browser_context.cc
@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/environment.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/threading/thread.h"
@@ -43,12 +43,6 @@ class ShellBrowserContext::ShellResourceContext : public ResourceContext {
     CHECK(getter_);
     return getter_->GetURLRequestContext();
   }
-  virtual bool AllowMicAccess(const GURL& origin) OVERRIDE {
-    return false;
-  }
-  virtual bool AllowCameraAccess(const GURL& origin) OVERRIDE {
-    return false;
-  }
 
   void set_url_request_context_getter(ShellURLRequestContextGetter* getter) {
     getter_ = getter;
@@ -196,7 +190,7 @@ BrowserPluginGuestManager* ShellBrowserContext::GetGuestManager() {
   return guest_manager_;
 }
 
-quota::SpecialStoragePolicy* ShellBrowserContext::GetSpecialStoragePolicy() {
+storage::SpecialStoragePolicy* ShellBrowserContext::GetSpecialStoragePolicy() {
   return NULL;
 }