Revert 115346. The change didn't break anything, the test was faulty. Will disable in a followup. - Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests

on win,linux,mac.

Original change: Rename TabContents::controller() to GetController and put it into the WebContents namespace.

BUG=98716
TBR=dpranke
Review URL: http://codereview.chromium.org/8956050

TBR=jam

Review URL: http://codereview.chromium.org/9018016

TBR=thakis@chromium.org

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

1 files changed, 7 insertions, 6 deletions

diff --git a/chrome/browser/ui/sync/tab_contents_wrapper_synced_tab_delegate.cc b/chrome/browser/ui/sync/tab_contents_wrapper_synced_tab_delegate.cc
index 65d66a5..4e9cee3 100644
--- a/chrome/browser/ui/sync/tab_contents_wrapper_synced_tab_delegate.cc
+++ b/chrome/browser/ui/sync/tab_contents_wrapper_synced_tab_delegate.cc
@@ -46,28 +46,29 @@ const std::string& TabContentsWrapperSyncedTabDelegate::GetExtensionAppId()
 }
 
 int TabContentsWrapperSyncedTabDelegate::GetCurrentEntryIndex() const {
-  return tab_contents_wrapper_->tab_contents()->controller().
+  return tab_contents_wrapper_->tab_contents()->GetController().
       GetCurrentEntryIndex();
 }
 
 int TabContentsWrapperSyncedTabDelegate::GetEntryCount() const {
-  return tab_contents_wrapper_->tab_contents()->controller().entry_count();
+  return tab_contents_wrapper_->tab_contents()->GetController().entry_count();
 }
 
 int TabContentsWrapperSyncedTabDelegate::GetPendingEntryIndex() const {
-  return tab_contents_wrapper_->tab_contents()->controller().
+  return tab_contents_wrapper_->tab_contents()->GetController().
       pending_entry_index();
 }
 
 NavigationEntry* TabContentsWrapperSyncedTabDelegate::GetPendingEntry() const {
-  return tab_contents_wrapper_->tab_contents()->controller().pending_entry();
+  return tab_contents_wrapper_->tab_contents()->GetController().pending_entry();
 }
 
 NavigationEntry* TabContentsWrapperSyncedTabDelegate::GetEntryAtIndex(int i)
     const {
-  return tab_contents_wrapper_->tab_contents()->controller().GetEntryAtIndex(i);
+  return
+      tab_contents_wrapper_->tab_contents()->GetController().GetEntryAtIndex(i);
 }
 
 NavigationEntry* TabContentsWrapperSyncedTabDelegate::GetActiveEntry() const {
-  return tab_contents_wrapper_->tab_contents()->controller().GetActiveEntry();
+  return tab_contents_wrapper_->tab_contents()->GetController().GetActiveEntry();
 }