TabContents -> WebContentsImpl, part 2.

BUG=105875
TEST=no change

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

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

23 files changed, 54 insertions, 54 deletions

diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index ec14182..089152f 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -41,7 +41,7 @@ include_rules = [
   "+content/browser/renderer_host/render_view_host_factory.h",
   "+content/browser/tab_contents/tab_contents_view_helper.h",
   "+content/browser/tab_contents/web_contents_drag_win.h",
-  "+content/browser/tab_contents/web_drag_dest_win.h",
+  "+content/browser/web_contents/web_drag_dest_win.h",
   # DO NOT ADD ANY MORE ITEMS TO THE ABOVE LIST!
 
   "-content/common",
diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc
index 2e2248c..8e060c7 100644
--- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc
+++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate.h"
 #include "content/browser/tab_contents/web_contents_drag_win.h"
-#include "content/browser/tab_contents/web_drag_dest_win.h"
+#include "content/browser/web_contents/web_drag_dest_win.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
diff --git a/content/browser/tab_contents/tab_contents_view_gtk.cc b/content/browser/tab_contents/tab_contents_view_gtk.cc
index 953d591..a736318 100644
--- a/content/browser/tab_contents/tab_contents_view_gtk.cc
+++ b/content/browser/tab_contents/tab_contents_view_gtk.cc
@@ -18,8 +18,8 @@
 #include "content/browser/renderer_host/render_widget_host_view_gtk.h"
 #include "content/browser/tab_contents/interstitial_page_impl.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/browser/tab_contents/web_drag_dest_gtk.h"
-#include "content/browser/tab_contents/web_drag_source_gtk.h"
+#include "content/browser/web_contents/web_drag_dest_gtk.h"
+#include "content/browser/web_contents/web_drag_source_gtk.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_view_delegate.h"
 #include "ui/base/gtk/gtk_expanded_container.h"
diff --git a/content/browser/tab_contents/tab_contents_view_win.cc b/content/browser/tab_contents/tab_contents_view_win.cc
index 135eab6..46b1e80 100644
--- a/content/browser/tab_contents/tab_contents_view_win.cc
+++ b/content/browser/tab_contents/tab_contents_view_win.cc
@@ -11,7 +11,7 @@
 #include "content/browser/tab_contents/interstitial_page_impl.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/web_contents_drag_win.h"
-#include "content/browser/tab_contents/web_drag_dest_win.h"
+#include "content/browser/web_contents/web_drag_dest_win.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_view_delegate.h"
 #include "ui/gfx/screen.h"
diff --git a/content/browser/tab_contents/web_contents_drag_win.cc b/content/browser/tab_contents/web_contents_drag_win.cc
index 2201fe7..cbf0178 100644
--- a/content/browser/tab_contents/web_contents_drag_win.cc
+++ b/content/browser/tab_contents/web_contents_drag_win.cc
@@ -17,9 +17,9 @@
 #include "base/utf_string_conversions.h"
 #include "content/browser/download/drag_download_file.h"
 #include "content/browser/download/drag_download_util.h"
-#include "content/browser/tab_contents/web_drag_dest_win.h"
-#include "content/browser/tab_contents/web_drag_source_win.h"
-#include "content/browser/tab_contents/web_drag_utils_win.h"
+#include "content/browser/web_contents/web_drag_dest_win.h"
+#include "content/browser/web_contents/web_drag_source_win.h"
+#include "content/browser/web_contents/web_drag_utils_win.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/web_contents.h"
diff --git a/content/browser/tab_contents/web_contents_view_mac.mm b/content/browser/tab_contents/web_contents_view_mac.mm
index c115bb2..3e5e005 100644
--- a/content/browser/tab_contents/web_contents_view_mac.mm
+++ b/content/browser/tab_contents/web_contents_view_mac.mm
@@ -15,8 +15,8 @@
 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
 #include "content/browser/tab_contents/popup_menu_helper_mac.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#import "content/browser/tab_contents/web_drag_dest_mac.h"
-#import "content/browser/tab_contents/web_drag_source_mac.h"
+#import "content/browser/web_contents/web_drag_dest_mac.h"
+#import "content/browser/web_contents/web_drag_source_mac.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_view_delegate.h"
diff --git a/content/browser/tab_contents/web_drag_dest_gtk.cc b/content/browser/web_contents/web_drag_dest_gtk.cc
index 304350e..572a135c 100644
--- a/content/browser/tab_contents/web_drag_dest_gtk.cc
+++ b/content/browser/web_contents/web_drag_dest_gtk.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/tab_contents/web_drag_dest_gtk.h"
+#include "content/browser/web_contents/web_drag_dest_gtk.h"
 
 #include <string>
 
diff --git a/content/browser/tab_contents/web_drag_dest_gtk.h b/content/browser/web_contents/web_drag_dest_gtk.h
index 7790604..6eaa104 100644
--- a/content/browser/tab_contents/web_drag_dest_gtk.h
+++ b/content/browser/web_contents/web_drag_dest_gtk.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_TAB_CONTENTS_WEB_DRAG_DEST_GTK_H_
-#define CONTENT_BROWSER_TAB_CONTENTS_WEB_DRAG_DEST_GTK_H_
+#ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_DEST_GTK_H_
+#define CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_DEST_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
@@ -105,4 +105,4 @@ class CONTENT_EXPORT WebDragDestGtk {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_TAB_CONTENTS_WEB_DRAG_DEST_GTK_H_
+#endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_DEST_GTK_H_
diff --git a/content/browser/tab_contents/web_drag_dest_mac.h b/content/browser/web_contents/web_drag_dest_mac.h
index 0e22fa0..0e22fa0 100644
--- a/content/browser/tab_contents/web_drag_dest_mac.h
+++ b/content/browser/web_contents/web_drag_dest_mac.h
diff --git a/content/browser/tab_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm
index 5db094a..55e7985 100644
--- a/content/browser/tab_contents/web_drag_dest_mac.mm
+++ b/content/browser/web_contents/web_drag_dest_mac.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "content/browser/tab_contents/web_drag_dest_mac.h"
+#import "content/browser/web_contents/web_drag_dest_mac.h"
 
 #include "base/sys_string_conversions.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
diff --git a/content/browser/tab_contents/web_drag_dest_mac_unittest.mm b/content/browser/web_contents/web_drag_dest_mac_unittest.mm
index 92905a6..9d8cda4 100644
--- a/content/browser/tab_contents/web_drag_dest_mac_unittest.mm
+++ b/content/browser/web_contents/web_drag_dest_mac_unittest.mm
@@ -8,7 +8,7 @@
 #include "base/utf_string_conversions.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/tab_contents/test_web_contents.h"
-#import "content/browser/tab_contents/web_drag_dest_mac.h"
+#import "content/browser/web_contents/web_drag_dest_mac.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 #import "ui/base/dragdrop/cocoa_dnd_util.h"
diff --git a/content/browser/tab_contents/web_drag_dest_win.cc b/content/browser/web_contents/web_drag_dest_win.cc
index 1fcb49b..9e5aed3 100644
--- a/content/browser/tab_contents/web_drag_dest_win.cc
+++ b/content/browser/web_contents/web_drag_dest_win.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/tab_contents/web_drag_dest_win.h"
+#include "content/browser/web_contents/web_drag_dest_win.h"
 
 #include <windows.h>
 #include <shlobj.h>
 
 #include "content/browser/renderer_host/render_view_host_impl.h"
-#include "content/browser/tab_contents/web_drag_utils_win.h"
+#include "content/browser/web_contents/web_drag_utils_win.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_drag_dest_delegate.h"
 #include "googleurl/src/gurl.h"
diff --git a/content/browser/tab_contents/web_drag_dest_win.h b/content/browser/web_contents/web_drag_dest_win.h
index 8bb16c2..bb27f66 100644
--- a/content/browser/tab_contents/web_drag_dest_win.h
+++ b/content/browser/web_contents/web_drag_dest_win.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_TAB_CONTENTS_WEB_DRAG_DEST_WIN_H_
-#define CONTENT_BROWSER_TAB_CONTENTS_WEB_DRAG_DEST_WIN_H_
+#ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_DEST_WIN_H_
+#define CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_DEST_WIN_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
@@ -78,4 +78,4 @@ class CONTENT_EXPORT WebDragDest : public ui::DropTarget {
   DISALLOW_COPY_AND_ASSIGN(WebDragDest);
 };
 
-#endif  // CONTENT_BROWSER_TAB_CONTENTS_WEB_DRAG_DEST_WIN_H_
+#endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_DEST_WIN_H_
diff --git a/content/browser/tab_contents/web_drag_source_gtk.cc b/content/browser/web_contents/web_drag_source_gtk.cc
index cb894b2..31e9c03 100644
--- a/content/browser/tab_contents/web_drag_source_gtk.cc
+++ b/content/browser/web_contents/web_drag_source_gtk.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/tab_contents/web_drag_source_gtk.h"
+#include "content/browser/web_contents/web_drag_source_gtk.h"
 
 #include <string>
 
diff --git a/content/browser/tab_contents/web_drag_source_gtk.h b/content/browser/web_contents/web_drag_source_gtk.h
index 929c84d..159a915 100644
--- a/content/browser/tab_contents/web_drag_source_gtk.h
+++ b/content/browser/web_contents/web_drag_source_gtk.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_TAB_WEB_DRAG_SOURCE_GTK_H_
-#define CONTENT_BROWSER_TAB_WEB_DRAG_SOURCE_GTK_H_
+#ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_SOURCE_GTK_H_
+#define CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_SOURCE_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
@@ -112,4 +112,4 @@ class CONTENT_EXPORT WebDragSourceGtk : public MessageLoopForUI::Observer {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_TAB_WEB_DRAG_SOURCE_GTK_H_
+#endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_SOURCE_GTK_H_
diff --git a/content/browser/tab_contents/web_drag_source_mac.h b/content/browser/web_contents/web_drag_source_mac.h
index 6bb782f..6bb782f 100644
--- a/content/browser/tab_contents/web_drag_source_mac.h
+++ b/content/browser/web_contents/web_drag_source_mac.h
diff --git a/content/browser/tab_contents/web_drag_source_mac.mm b/content/browser/web_contents/web_drag_source_mac.mm
index 68f4696..b0238d1 100644
--- a/content/browser/tab_contents/web_drag_source_mac.mm
+++ b/content/browser/web_contents/web_drag_source_mac.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "content/browser/tab_contents/web_drag_source_mac.h"
+#import "content/browser/web_contents/web_drag_source_mac.h"
 
 #include <sys/param.h>
 
diff --git a/content/browser/tab_contents/web_drag_source_win.cc b/content/browser/web_contents/web_drag_source_win.cc
index 82b7f29..a73df23 100644
--- a/content/browser/tab_contents/web_drag_source_win.cc
+++ b/content/browser/web_contents/web_drag_source_win.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/tab_contents/web_drag_source_win.h"
+#include "content/browser/web_contents/web_drag_source_win.h"
 
 #include "base/bind.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
-#include "content/browser/tab_contents/web_drag_utils_win.h"
+#include "content/browser/web_contents/web_drag_utils_win.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
diff --git a/content/browser/tab_contents/web_drag_source_win.h b/content/browser/web_contents/web_drag_source_win.h
index 68316b6..64a0c51 100644
--- a/content/browser/tab_contents/web_drag_source_win.h
+++ b/content/browser/web_contents/web_drag_source_win.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_TAB_CONTENTS_WEB_DRAG_SOURCE_WIN_H_
-#define CONTENT_BROWSER_TAB_CONTENTS_WEB_DRAG_SOURCE_WIN_H_
+#ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_SOURCE_WIN_H_
+#define CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_SOURCE_WIN_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -66,4 +66,4 @@ class WebDragSource : public ui::DragSource,
   DISALLOW_COPY_AND_ASSIGN(WebDragSource);
 };
 
-#endif  // CONTENT_BROWSER_TAB_CONTENTS_WEB_DRAG_SOURCE_WIN_H_
+#endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_SOURCE_WIN_H_
diff --git a/content/browser/tab_contents/web_drag_utils_win.cc b/content/browser/web_contents/web_drag_utils_win.cc
index 53c40b0..8781cc6 100644
--- a/content/browser/tab_contents/web_drag_utils_win.cc
+++ b/content/browser/web_contents/web_drag_utils_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/tab_contents/web_drag_utils_win.h"
+#include "content/browser/web_contents/web_drag_utils_win.h"
 
 #include <oleidl.h>
 #include "base/logging.h"
diff --git a/content/browser/tab_contents/web_drag_utils_win.h b/content/browser/web_contents/web_drag_utils_win.h
index c29ac48..f35d45f 100644
--- a/content/browser/tab_contents/web_drag_utils_win.h
+++ b/content/browser/web_contents/web_drag_utils_win.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_TAB_CONTENTS_WEB_DRAG_UTILS_WIN_H_
-#define CONTENT_BROWSER_TAB_CONTENTS_WEB_DRAG_UTILS_WIN_H_
+#ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_UTILS_WIN_H_
+#define CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_UTILS_WIN_H_
 #pragma once
 
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h"
@@ -20,4 +20,4 @@ DWORD WebDragOpMaskToWinDragOpMask(WebKit::WebDragOperationsMask ops);
 
 }  // namespace web_drag_utils_win
 
-#endif  // CONTENT_BROWSER_TAB_CONTENTS_WEB_DRAG_UTILS_WIN_H_
+#endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_UTILS_WIN_H_
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 712d888..facaa55 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -681,20 +681,20 @@
     'browser/tab_contents/web_contents_view_android.h',
     'browser/tab_contents/web_contents_view_mac.h',
     'browser/tab_contents/web_contents_view_mac.mm',
-    'browser/tab_contents/web_drag_dest_gtk.cc',
-    'browser/tab_contents/web_drag_dest_gtk.h',
-    'browser/tab_contents/web_drag_dest_mac.h',
-    'browser/tab_contents/web_drag_dest_mac.mm',
-    'browser/tab_contents/web_drag_dest_win.cc',
-    'browser/tab_contents/web_drag_dest_win.h',
-    'browser/tab_contents/web_drag_source_gtk.cc',
-    'browser/tab_contents/web_drag_source_gtk.h',
-    'browser/tab_contents/web_drag_source_mac.h',
-    'browser/tab_contents/web_drag_source_mac.mm',
-    'browser/tab_contents/web_drag_source_win.cc',
-    'browser/tab_contents/web_drag_source_win.h',
-    'browser/tab_contents/web_drag_utils_win.cc',
-    'browser/tab_contents/web_drag_utils_win.h',
+    'browser/web_contents/web_drag_dest_gtk.cc',
+    'browser/web_contents/web_drag_dest_gtk.h',
+    'browser/web_contents/web_drag_dest_mac.h',
+    'browser/web_contents/web_drag_dest_mac.mm',
+    'browser/web_contents/web_drag_dest_win.cc',
+    'browser/web_contents/web_drag_dest_win.h',
+    'browser/web_contents/web_drag_source_gtk.cc',
+    'browser/web_contents/web_drag_source_gtk.h',
+    'browser/web_contents/web_drag_source_mac.h',
+    'browser/web_contents/web_drag_source_mac.mm',
+    'browser/web_contents/web_drag_source_win.cc',
+    'browser/web_contents/web_drag_source_win.h',
+    'browser/web_contents/web_drag_utils_win.cc',
+    'browser/web_contents/web_drag_utils_win.h',
     'browser/trace_controller_impl.cc',
     'browser/trace_controller_impl.h',
     'browser/trace_message_filter.cc',
@@ -875,10 +875,10 @@
         ['exclude', '^browser/tab_contents/tab_contents_view_win.h'],
         ['exclude', '^browser/tab_contents/web_contents_drag_win.cc'],
         ['exclude', '^browser/tab_contents/web_contents_drag_win.h'],
-        ['exclude', '^browser/tab_contents/web_drag_dest_win.cc'],
-        ['exclude', '^browser/tab_contents/web_drag_dest_win.h'],
-        ['exclude', '^browser/tab_contents/web_drag_source_win.cc'],
-        ['exclude', '^browser/tab_contents/web_drag_source_win.h'],
+        ['exclude', '^browser/web_contents/web_drag_dest_win.cc'],
+        ['exclude', '^browser/web_contents/web_drag_dest_win.h'],
+        ['exclude', '^browser/web_contents/web_drag_source_win.cc'],
+        ['exclude', '^browser/web_contents/web_drag_source_win.h'],
       ],
     }, {
       'sources/': [
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 7e953b4..65697db 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -261,8 +261,8 @@
         'browser/tab_contents/tab_contents_delegate_unittest.cc',
         'browser/tab_contents/tab_contents_unittest.cc',
         'browser/tab_contents/web_contents_view_mac_unittest.mm',
-        'browser/tab_contents/web_drag_dest_mac_unittest.mm',
         'browser/trace_subscriber_stdio_unittest.cc',
+        'browser/web_contents/web_drag_dest_mac_unittest.mm',
         'browser/webui/web_ui_message_handler_unittest.cc',
         'common/mac/attributed_string_coder_unittest.mm',
         'common/mac/font_descriptor_unittest.mm',