Remove unused WebKit includes and DEPS entries from chrome/browser

R=sky
BUG=237267

Review URL: https://chromiumcodereview.appspot.com/19462014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212707 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 2 insertions, 56 deletions

diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index 30570623..6fa89c7 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -92,17 +92,13 @@ include_rules = [
   # No inclusion of WebKit from the browser, other than strictly enum/POD,
   # header-only types, and some selected common code.
   "-third_party/WebKit",
-  "+third_party/WebKit/public/platform/WebCString.h",
   "+third_party/WebKit/public/platform/WebRect.h",
   "+third_party/WebKit/public/platform/WebReferrerPolicy.h",
   "+third_party/WebKit/public/platform/WebScreenInfo.h",
-  "+third_party/WebKit/public/platform/WebString.h",
-  "+third_party/WebKit/public/platform/WebURL.h",
   "+third_party/WebKit/public/web/WebAutofillClient.h",
   "+third_party/WebKit/public/web/WebCache.h",
   "+third_party/WebKit/public/web/WebContextMenuData.h",
   "+third_party/WebKit/public/web/WebCursorInfo.h",
-  "+third_party/WebKit/public/web/WebDevToolsAgent.h",
   "+third_party/WebKit/public/web/WebFindOptions.h",
   "+third_party/WebKit/public/web/WebInputEvent.h",
   "+third_party/WebKit/public/web/WebMediaPlayerAction.h",
@@ -112,7 +108,5 @@ include_rules = [
   "+third_party/WebKit/public/web/WebTextDirection.h",
 
   # These should be burned down. http://crbug.com/237267
-  "!third_party/WebKit/public/web/WebKit.h",
-  "!third_party/WebKit/public/web/WebSecurityOrigin.h",
   "!third_party/WebKit/public/web/WebView.h",
 ]
diff --git a/chrome/browser/browsing_data/browsing_data_database_helper.cc b/chrome/browser/browsing_data/browsing_data_database_helper.cc
index 023dfff..5cd0fb5 100644
--- a/chrome/browser/browsing_data/browsing_data_database_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_database_helper.cc
@@ -15,8 +15,6 @@
 #include "content/public/browser/storage_partition.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
-#include "third_party/WebKit/public/platform/WebString.h"
 #include "webkit/common/database/database_identifier.h"
 
 using content::BrowserContext;
diff --git a/chrome/browser/browsing_data/browsing_data_helper.cc b/chrome/browser/browsing_data/browsing_data_helper.cc
index 0faf856..73239b7 100644
--- a/chrome/browser/browsing_data/browsing_data_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_helper.cc
@@ -11,7 +11,6 @@
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "extensions/common/constants.h"
-#include "third_party/WebKit/public/platform/WebString.h"
 #include "url/gurl.h"
 
 // Static
@@ -34,11 +33,6 @@ bool BrowsingDataHelper::IsWebScheme(const std::string& scheme) {
 }
 
 // Static
-bool BrowsingDataHelper::IsWebScheme(const WebKit::WebString& scheme) {
-  return BrowsingDataHelper::IsWebScheme(UTF16ToUTF8(scheme));
-}
-
-// Static
 bool BrowsingDataHelper::HasWebScheme(const GURL& origin) {
   return BrowsingDataHelper::IsWebScheme(origin.scheme());
 }
@@ -49,11 +43,6 @@ bool BrowsingDataHelper::IsExtensionScheme(const std::string& scheme) {
 }
 
 // Static
-bool BrowsingDataHelper::IsExtensionScheme(const WebKit::WebString& scheme) {
-  return BrowsingDataHelper::IsExtensionScheme(UTF16ToUTF8(scheme));
-}
-
-// Static
 bool BrowsingDataHelper::HasExtensionScheme(const GURL& origin) {
   return BrowsingDataHelper::IsExtensionScheme(origin.scheme());
 }
diff --git a/chrome/browser/browsing_data/browsing_data_helper.h b/chrome/browser/browsing_data/browsing_data_helper.h
index 65afbcc..1afacdb 100644
--- a/chrome/browser/browsing_data/browsing_data_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_helper.h
@@ -11,10 +11,6 @@
 
 #include "base/basictypes.h"
 
-namespace WebKit {
-class WebString;
-}
-
 class ExtensionSpecialStoragePolicy;
 class GURL;
 
@@ -33,12 +29,10 @@ class BrowsingDataHelper {
   // in ChildProcessSecurityPolicy, but excluding schemes like
   // `chrome-extension`.
   static bool IsWebScheme(const std::string& scheme);
-  static bool IsWebScheme(const WebKit::WebString& scheme);
   static bool HasWebScheme(const GURL& origin);
 
   // Returns true iff the provided scheme is an extension.
   static bool IsExtensionScheme(const std::string& scheme);
-  static bool IsExtensionScheme(const WebKit::WebString& scheme);
   static bool HasExtensionScheme(const GURL& origin);
 
   // Returns true if the provided origin matches the provided mask.
diff --git a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc
index e19b81a..4901f64 100644
--- a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc
@@ -10,7 +10,6 @@
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/platform/WebString.h"
 #include "url/gurl.h"
 
 namespace {
@@ -39,17 +38,13 @@ class BrowsingDataHelperTest : public testing::Test {
   bool IsWebScheme(const std::string& scheme) {
     GURL test(scheme + "://example.com");
     return (BrowsingDataHelper::HasWebScheme(test) &&
-            BrowsingDataHelper::IsWebScheme(scheme) &&
-            BrowsingDataHelper::IsWebScheme(
-                WebKit::WebString::fromUTF8(scheme)));
+            BrowsingDataHelper::IsWebScheme(scheme));
   }
 
   bool IsExtensionScheme(const std::string& scheme) {
     GURL test(scheme + "://example.com");
     return (BrowsingDataHelper::HasExtensionScheme(test) &&
-            BrowsingDataHelper::IsExtensionScheme(scheme) &&
-            BrowsingDataHelper::IsExtensionScheme(
-                WebKit::WebString::fromUTF8(scheme)));
+            BrowsingDataHelper::IsExtensionScheme(scheme));
   }
 
   bool Match(const GURL& origin,
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
index 03b176a..3d659ce 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -43,8 +43,6 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
-#include "third_party/WebKit/public/platform/WebString.h"
 #include "webkit/browser/quota/mock_quota_manager.h"
 #include "webkit/browser/quota/quota_manager.h"
 #include "webkit/common/dom_storage/dom_storage_types.h"
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
index 3782602..cdf6bc4 100644
--- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
@@ -24,8 +24,6 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/view_type_utils.h"
-#include "third_party/WebKit/public/platform/WebString.h"
-#include "third_party/WebKit/public/web/WebSecurityOrigin.h"
 
 using extensions::APIPermission;
 
diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc
index b75db4f..90c827b 100644
--- a/chrome/browser/notifications/desktop_notification_service.cc
+++ b/chrome/browser/notifications/desktop_notification_service.cc
@@ -42,7 +42,6 @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/escape.h"
-#include "third_party/WebKit/public/web/WebSecurityOrigin.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/message_center_util.h"
@@ -55,7 +54,6 @@ using content::WebContents;
 using message_center::NotifierId;
 using WebKit::WebNotificationPresenter;
 using WebKit::WebTextDirection;
-using WebKit::WebSecurityOrigin;
 
 
 // NotificationPermissionInfoBarDelegate --------------------------------------
diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc
index 7b969f3..9d07c8b 100644
--- a/chrome/browser/notifications/desktop_notifications_unittest.cc
+++ b/chrome/browser/notifications/desktop_notifications_unittest.cc
@@ -21,7 +21,6 @@
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #include "ash/test/test_shell_delegate.h"
-#include "third_party/WebKit/public/web/WebKit.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
@@ -103,7 +102,6 @@ DesktopNotificationsTest::~DesktopNotificationsTest() {
 void DesktopNotificationsTest::SetUp() {
   ui::InitializeInputMethodForTesting();
 #if defined(USE_ASH)
-  WebKit::initialize(webkit_platform_support_.Get());
   ui::ScopedAnimationDurationScaleMode normal_duration_mode(
       ui::ScopedAnimationDurationScaleMode::ZERO_DURATION);
   // The message center is notmally initialized on |g_browser_process| which
@@ -133,7 +131,6 @@ void DesktopNotificationsTest::TearDown() {
   // is not created for these tests.
   message_center::MessageCenter::Shutdown();
   aura::Env::DeleteInstance();
-  WebKit::shutdown();
 #endif
   ui::ShutdownInputMethodForTesting();
 }
diff --git a/chrome/browser/notifications/desktop_notifications_unittest.h b/chrome/browser/notifications/desktop_notifications_unittest.h
index d0807ed..935710f 100644
--- a/chrome/browser/notifications/desktop_notifications_unittest.h
+++ b/chrome/browser/notifications/desktop_notifications_unittest.h
@@ -114,11 +114,6 @@ class DesktopNotificationsTest : public testing::Test {
   // Real DesktopNotificationService
   scoped_ptr<DesktopNotificationService> service_;
 
-#if defined(USE_ASH)
-  content::RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox
-      webkit_platform_support_;
-#endif
-
   // Contains the cumulative output of the unit test.
   static std::string log_output_;
 };
diff --git a/chrome/browser/renderer_host/pepper/pepper_extensions_common_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_extensions_common_message_filter.cc
index 380b47a..e766128 100644
--- a/chrome/browser/renderer_host/pepper/pepper_extensions_common_message_filter.cc
+++ b/chrome/browser/renderer_host/pepper/pepper_extensions_common_message_filter.cc
@@ -23,7 +23,6 @@
 #include "ppapi/host/dispatch_host_message.h"
 #include "ppapi/host/host_message_context.h"
 #include "ppapi/proxy/ppapi_messages.h"
-#include "third_party/WebKit/public/web/WebSecurityOrigin.h"
 
 namespace chrome {
 
diff --git a/chrome/browser/sessions/persistent_tab_restore_service_browsertest.cc b/chrome/browser/sessions/persistent_tab_restore_service_browsertest.cc
index 84c63a2..1840bd0 100644
--- a/chrome/browser/sessions/persistent_tab_restore_service_browsertest.cc
+++ b/chrome/browser/sessions/persistent_tab_restore_service_browsertest.cc
@@ -32,7 +32,6 @@
 #include "content/public/test/test_utils.h"
 #include "content/public/test/web_contents_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/web/WebKit.h"
 
 typedef TabRestoreService::Tab Tab;
 typedef TabRestoreService::Window Window;
@@ -79,7 +78,6 @@ class PersistentTabRestoreServiceTest : public ChromeRenderViewHostTestHarness {
 
   // testing::Test:
   virtual void SetUp() OVERRIDE {
-    WebKit::initialize(webkit_platform_support_.Get());
     ChromeRenderViewHostTestHarness::SetUp();
     time_factory_ = new PersistentTabRestoreTimeFactory();
     service_.reset(new PersistentTabRestoreService(profile(), time_factory_));
@@ -90,7 +88,6 @@ class PersistentTabRestoreServiceTest : public ChromeRenderViewHostTestHarness {
     service_.reset();
     delete time_factory_;
     ChromeRenderViewHostTestHarness::TearDown();
-    WebKit::shutdown();
   }
 
   TabRestoreService::Entries* mutable_entries() {
@@ -171,8 +168,6 @@ class PersistentTabRestoreServiceTest : public ChromeRenderViewHostTestHarness {
   std::string user_agent_override_;
   scoped_ptr<PersistentTabRestoreService> service_;
   PersistentTabRestoreTimeFactory* time_factory_;
-  content::RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox
-      webkit_platform_support_;
 };
 
 namespace {
diff --git a/chrome/browser/ui/views/external_tab_container_win.cc b/chrome/browser/ui/views/external_tab_container_win.cc
index 63e2688..b921b66 100644
--- a/chrome/browser/ui/views/external_tab_container_win.cc
+++ b/chrome/browser/ui/views/external_tab_container_win.cc
@@ -66,9 +66,7 @@
 #include "content/public/common/ssl_status.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
-#include "third_party/WebKit/public/platform/WebString.h"
 #include "ui/base/events/event_utils.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
@@ -93,9 +91,7 @@ using content::OpenURLParams;
 using content::RenderViewHost;
 using content::SSLStatus;
 using content::WebContents;
-using WebKit::WebCString;
 using WebKit::WebReferrerPolicy;
-using WebKit::WebString;
 
 namespace {