Revert "Move core web_view code to extensions." (patchset #6 of https://codereview.chromium.org/4968

chrome/browser/guest_view/web_view/web_view_permission_helper.h

Index: chrome/browser/guest_view/web_view/web_view_permission_helper.h
diff --git a/extensions/browser/guest_view/web_view/web_view_permission_helper.h b/chrome/browser/guest_view/web_view/web_view_permission_helper.h
similarity index 94%
rename from extensions/browser/guest_view/web_view/web_view_permission_helper.h
rename to chrome/browser/guest_view/web_view/web_view_permission_helper.h
index 161d550e464713d858c01024a9446b09f1b64cb5..59e7221b8699777dbdc7e27b53535674c6184dff 100644
--- a/extensions/browser/guest_view/web_view/web_view_permission_helper.h
+++ b/chrome/browser/guest_view/web_view/web_view_permission_helper.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_PERMISSION_HELPER_H_
-#define EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_PERMISSION_HELPER_H_
+#ifndef CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_PERMISSION_HELPER_H_
+#define CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_PERMISSION_HELPER_H_
 
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/user_metrics_action.h"
+#include "chrome/browser/guest_view/web_view/web_view_permission_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/media_stream_request.h"
 #include "extensions/browser/guest_view/guest_view_constants.h"
-#include "extensions/browser/guest_view/web_view/web_view_permission_types.h"
 
 using base::UserMetricsAction;
 
@@ -146,10 +146,10 @@ class WebViewPermissionHelper
 
   WebViewPermissionHelper::RequestMap pending_permission_requests_;
 
-  scoped_ptr<WebViewPermissionHelperDelegate>
+  scoped_ptr<extensions::WebViewPermissionHelperDelegate>
       web_view_permission_helper_delegate_;
 
-  WebViewGuest* const web_view_guest_;
+  WebViewGuest* web_view_guest_;
 
   base::WeakPtrFactory<WebViewPermissionHelper> weak_factory_;
 
@@ -158,4 +158,4 @@ class WebViewPermissionHelper
 
 }  // namespace extensions
 
-#endif  // EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_PERMISSION_HELPER_H_
+#endif  // CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_PERMISSION_HELPER_H_