Update more includes that were pointing to the old locations.

TBR=avi
Review URL: http://codereview.chromium.org/6598086

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

16 files changed, 6 insertions, 150 deletions

diff --git a/chrome/browser/tab_contents/constrained_window.h b/chrome/browser/tab_contents/constrained_window.h
deleted file mode 100644
index b20a60e..0000000
--- a/chrome/browser/tab_contents/constrained_window.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_TAB_CONTENTS_CONSTRAINED_WINDOW_H_
-#define CHROME_BROWSER_TAB_CONTENTS_CONSTRAINED_WINDOW_H_
-#pragma once
-
-// TODO(jam): remove this file when all files have been converted.
-#include "content/browser/tab_contents/constrained_window.h"
-
-#endif  // CHROME_BROWSER_TAB_CONTENTS_CONSTRAINED_WINDOW_H_
diff --git a/chrome/browser/tab_contents/infobar_delegate.cc b/chrome/browser/tab_contents/infobar_delegate.cc
index 1540dc8..37829cf 100644
--- a/chrome/browser/tab_contents/infobar_delegate.cc
+++ b/chrome/browser/tab_contents/infobar_delegate.cc
@@ -6,9 +6,9 @@
 
 #include "base/logging.h"
 #include "build/build_config.h"
-#include "chrome/browser/tab_contents/navigation_entry.h"
-#include "chrome/browser/tab_contents/navigation_controller.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
+#include "content/browser/tab_contents/navigation_entry.h"
+#include "content/browser/tab_contents/navigation_controller.h"
+#include "content/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
diff --git a/chrome/browser/tab_contents/interstitial_page.h b/chrome/browser/tab_contents/interstitial_page.h
deleted file mode 100644
index 6a1ddb9..0000000
--- a/chrome/browser/tab_contents/interstitial_page.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
-#define CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
-#pragma once
-
-// TODO(jam): remove this file when all files have been converted.
-#include "content/browser/tab_contents/interstitial_page.h"
-
-#endif  // CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
diff --git a/chrome/browser/tab_contents/language_state.h b/chrome/browser/tab_contents/language_state.h
deleted file mode 100644
index 6c35545..0000000
--- a/chrome/browser/tab_contents/language_state.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_TAB_CONTENTS_LANGUAGE_STATE_H_
-#define CHROME_BROWSER_TAB_CONTENTS_LANGUAGE_STATE_H_
-#pragma once
-
-// TODO(jam): remove this file when all files have been converted.
-#include "content/browser/tab_contents/language_state.h"
-
-#endif  // CHROME_BROWSER_TAB_CONTENTS_LANGUAGE_STATE_H_
-
diff --git a/chrome/browser/tab_contents/navigation_controller.h b/chrome/browser/tab_contents/navigation_controller.h
deleted file mode 100644
index 7eb9d11..0000000
--- a/chrome/browser/tab_contents/navigation_controller.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
-#define CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
-#pragma once
-
-// TODO(jam): remove this file when all files have been converted.
-#include "content/browser/tab_contents/navigation_controller.h"
-
-#endif  // CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
diff --git a/chrome/browser/tab_contents/navigation_entry.h b/chrome/browser/tab_contents/navigation_entry.h
deleted file mode 100644
index a9f0cc0..0000000
--- a/chrome/browser/tab_contents/navigation_entry.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_
-#define CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_
-#pragma once
-
-// TODO(jam): remove this file when all files have been converted.
-#include "content/browser/tab_contents/navigation_entry.h"
-
-#endif  // CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_
diff --git a/chrome/browser/tab_contents/page_navigator.h b/chrome/browser/tab_contents/page_navigator.h
deleted file mode 100644
index 62c0333..0000000
--- a/chrome/browser/tab_contents/page_navigator.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_TAB_CONTENTS_PAGE_NAVIGATOR_H_
-#define CHROME_BROWSER_TAB_CONTENTS_PAGE_NAVIGATOR_H_
-#pragma once
-
-// TODO(jam): remove this file when all files have been converted.
-#include "content/browser/tab_contents/page_navigator.h"
-
-#endif  // CHROME_BROWSER_TAB_CONTENTS_PAGE_NAVIGATOR_H_
diff --git a/chrome/browser/tab_contents/provisional_load_details.h b/chrome/browser/tab_contents/provisional_load_details.h
deleted file mode 100644
index 1ee04248..0000000
--- a/chrome/browser/tab_contents/provisional_load_details.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_TAB_CONTENTS_PROVISIONAL_LOAD_DETAILS_H_
-#define CHROME_BROWSER_TAB_CONTENTS_PROVISIONAL_LOAD_DETAILS_H_
-#pragma once
-
-// TODO(jam): remove this file when all files have been converted.
-#include "content/browser/tab_contents/provisional_load_details.h"
-
-#endif  // CHROME_BROWSER_TAB_CONTENTS_PROVISIONAL_LOAD_DETAILS_H_
diff --git a/chrome/browser/tab_contents/render_view_host_manager.h b/chrome/browser/tab_contents/render_view_host_manager.h
deleted file mode 100644
index 7f1be04..0000000
--- a/chrome/browser/tab_contents/render_view_host_manager.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
-#define CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
-#pragma once
-
-// TODO(jam): remove this file when all files have been converted.
-#include "content/browser/tab_contents/render_view_host_manager.h"
-
-#endif  // CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
diff --git a/chrome/browser/tab_contents/tab_contents_delegate.h b/chrome/browser/tab_contents/tab_contents_delegate.h
deleted file mode 100644
index 23d5803..0000000
--- a/chrome/browser/tab_contents/tab_contents_delegate.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_DELEGATE_H_
-#define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_DELEGATE_H_
-#pragma once
-
-// TODO(jam): remove this file when all files have been converted.
-#include "content/browser/tab_contents/tab_contents_delegate.h"
-
-#endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_DELEGATE_H_
diff --git a/chrome/browser/tab_contents/tab_contents_observer.h b/chrome/browser/tab_contents/tab_contents_observer.h
deleted file mode 100644
index 0af56b32..0000000
--- a/chrome/browser/tab_contents/tab_contents_observer.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_OBSERVER_H_
-#define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_OBSERVER_H_
-
-// TODO(jam): remove this file when all files have been converted.
-#include "content/browser/tab_contents/tab_contents_observer.h"
-
-#endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_OBSERVER_H_
diff --git a/chrome/browser/tab_contents/tab_contents_view.h b/chrome/browser/tab_contents/tab_contents_view.h
deleted file mode 100644
index a703cf2..0000000
--- a/chrome/browser/tab_contents/tab_contents_view.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_H_
-#define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_H_
-#pragma once
-
-// TODO(jam): remove this file when all files have been converted.
-#include "content/browser/tab_contents/tab_contents_view.h"
-
-#endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_H_
diff --git a/chrome/browser/tab_contents/tab_contents_view_gtk.cc b/chrome/browser/tab_contents/tab_contents_view_gtk.cc
index 8374907..e7ea0b1 100644
--- a/chrome/browser/tab_contents/tab_contents_view_gtk.cc
+++ b/chrome/browser/tab_contents/tab_contents_view_gtk.cc
@@ -16,7 +16,6 @@
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
 #include "chrome/browser/tab_contents/render_view_context_menu_gtk.h"
-#include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tab_contents/web_drag_dest_gtk.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
@@ -32,6 +31,7 @@
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/tab_contents/interstitial_page.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
diff --git a/chrome/browser/tab_contents/tab_contents_view_gtk.h b/chrome/browser/tab_contents/tab_contents_view_gtk.h
index a11a307..e2d62a2 100644
--- a/chrome/browser/tab_contents/tab_contents_view_gtk.h
+++ b/chrome/browser/tab_contents/tab_contents_view_gtk.h
@@ -11,11 +11,11 @@
 #include <vector>
 
 #include "base/scoped_ptr.h"
-#include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/ui/gtk/focus_store_gtk.h"
 #include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
+#include "content/browser/tab_contents/tab_contents_view.h"
 #include "ui/base/gtk/gtk_signal.h"
 
 class ConstrainedWindowGtk;
diff --git a/chrome/browser/tab_contents/tab_contents_view_mac.h b/chrome/browser/tab_contents/tab_contents_view_mac.h
index 76d7888..e941cfc 100644
--- a/chrome/browser/tab_contents/tab_contents_view_mac.h
+++ b/chrome/browser/tab_contents/tab_contents_view_mac.h
@@ -12,10 +12,10 @@
 #include <vector>
 
 #include "base/scoped_nsobject.h"
-#include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/ui/cocoa/base_view.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
+#include "content/browser/tab_contents/tab_contents_view.h"
 #include "ui/gfx/size.h"
 
 @class FocusTracker;
diff --git a/chrome/browser/tab_contents/test_tab_contents.h b/chrome/browser/tab_contents/test_tab_contents.h
deleted file mode 100644
index 583bd81..0000000
--- a/chrome/browser/tab_contents/test_tab_contents.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_TAB_CONTENTS_TEST_TAB_CONTENTS_H_
-#define CHROME_BROWSER_TAB_CONTENTS_TEST_TAB_CONTENTS_H_
-#pragma once
-
-// TODO(jam): remove this file when all files have been converted.
-#include "content/browser/tab_contents/test_tab_contents.h"
-
-#endif  // CHROME_BROWSER_TAB_CONTENTS_TEST_TAB_CONTENTS_H_