Clean up TCW, make it solely a hub for 1:1 observer/helper objects.

chrome/browser/ui/cocoa/applescript/tab_applescript.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/applescript/tab_applescript.h"
 
 #import <Carbon/Carbon.h>
 #import <Foundation/NSAppleEventDescriptor.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #import "base/memory/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/cocoa/applescript/error_applescript.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/download/save_package.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_entry.h"
+#include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "googleurl/src/gurl.h"
 
 @interface AnyResultValue : NSObject {
  @private
   scoped_nsobject<NSAppleEventDescriptor> descriptor;
 }
 - (id)initWithDescriptor:(NSAppleEventDescriptor*)desc;
 - (NSAppleEventDescriptor *)scriptingAnyDescriptor;
 @end
@@ skipping 143 matching lines @@
 
   if ([self tempURL])
     [self setURL:[self tempURL]];
 }
 
 - (NSString*)URL {
   if (!tabContents_) {
     return nil;
   }
 
-  NavigationEntry* entry = tabContents_->controller().GetActiveEntry();
+  NavigationEntry* entry =
+      tabContents_->tab_contents()->controller().GetActiveEntry();
   if (!entry) {
     return nil;
   }
   const GURL& url = entry->virtual_url();
   return base::SysUTF8ToNSString(url.spec());
 }
 
 - (void)setURL:(NSString*)aURL {
   // If a scripter sets a URL before the node is added save it at a temporary
   // location.
   if (!tabContents_) {
     [self setTempURL:aURL];
     return;
   }
 
   GURL url(base::SysNSStringToUTF8(aURL));
   // check for valid url.
   if (!url.is_empty() && !url.is_valid()) {
     AppleScript::SetError(AppleScript::errInvalidURL);
     return;
   }
 
-  NavigationEntry* entry = tabContents_->controller().GetActiveEntry();
+  NavigationEntry* entry =
+      tabContents_->tab_contents()->controller().GetActiveEntry();
   if (!entry)
     return;
 
   const GURL& previousURL = entry->virtual_url();
   tabContents_->tab_contents()->OpenURL(OpenURLParams(
       url,
       content::Referrer(previousURL, WebKit::WebReferrerPolicyDefault),
       CURRENT_TAB,
       content::PAGE_TRANSITION_TYPED,
       false));
 }
 
 - (NSString*)title {
-  NavigationEntry* entry = tabContents_->controller().GetActiveEntry();
+  NavigationEntry* entry =
+      tabContents_->tab_contents()->controller().GetActiveEntry();
   if (!entry)
     return nil;
 
   std::wstring title;
   if (entry != NULL) {
     title = UTF16ToWideHack(entry->title());
   }
 
   return base::SysWideToNSString(title);
 }
 
 - (NSNumber*)loading {
   BOOL loadingValue = tabContents_->tab_contents()->IsLoading() ? YES : NO;
   return [NSNumber numberWithBool:loadingValue];
 }
 
 - (void)handlesUndoScriptCommand:(NSScriptCommand*)command {
-  RenderViewHost* view = tabContents_->render_view_host();
+  RenderViewHost* view = tabContents_->tab_contents()->render_view_host();
   if (!view) {
     NOTREACHED();
     return;
   }
 
   view->Undo();
 }
 
 - (void)handlesRedoScriptCommand:(NSScriptCommand*)command {
-  RenderViewHost* view = tabContents_->render_view_host();
+  RenderViewHost* view = tabContents_->tab_contents()->render_view_host();
   if (!view) {
     NOTREACHED();
     return;
   }
 
   view->Redo();
 }
 
 - (void)handlesCutScriptCommand:(NSScriptCommand*)command {
-  RenderViewHost* view = tabContents_->render_view_host();
+  RenderViewHost* view = tabContents_->tab_contents()->render_view_host();
   if (!view) {
     NOTREACHED();
     return;
   }
 
   view->Cut();
 }
 
 - (void)handlesCopyScriptCommand:(NSScriptCommand*)command {
-  RenderViewHost* view = tabContents_->render_view_host();
+  RenderViewHost* view = tabContents_->tab_contents()->render_view_host();
   if (!view) {
     NOTREACHED();
     return;
   }
 
   view->Copy();
 }
 
 - (void)handlesPasteScriptCommand:(NSScriptCommand*)command {
-  RenderViewHost* view = tabContents_->render_view_host();
+  RenderViewHost* view = tabContents_->tab_contents()->render_view_host();
   if (!view) {
     NOTREACHED();
     return;
   }
 
   view->Paste();
 }
 
 - (void)handlesSelectAllScriptCommand:(NSScriptCommand*)command {
-  RenderViewHost* view = tabContents_->render_view_host();
+  RenderViewHost* view = tabContents_->tab_contents()->render_view_host();
   if (!view) {
     NOTREACHED();
     return;
   }
 
   view->SelectAll();
 }
 
 - (void)handlesGoBackScriptCommand:(NSScriptCommand*)command {
-  NavigationController& navigationController = tabContents_->controller();
+  NavigationController& navigationController =
+      tabContents_->tab_contents()->controller();
   if (navigationController.CanGoBack())
     navigationController.GoBack();
 }
 
 - (void)handlesGoForwardScriptCommand:(NSScriptCommand*)command {
-  NavigationController& navigationController = tabContents_->controller();
+  NavigationController& navigationController =
+      tabContents_->tab_contents()->controller();
   if (navigationController.CanGoForward())
     navigationController.GoForward();
 }
 
 - (void)handlesReloadScriptCommand:(NSScriptCommand*)command {
-  NavigationController& navigationController = tabContents_->controller();
+  NavigationController& navigationController =
+      tabContents_->tab_contents()->controller();
   const bool checkForRepost = true;
   navigationController.Reload(checkForRepost);
 }
 
 - (void)handlesStopScriptCommand:(NSScriptCommand*)command {
-  RenderViewHost* view = tabContents_->render_view_host();
+  RenderViewHost* view = tabContents_->tab_contents()->render_view_host();
   if (!view) {
     // We tolerate Stop being called even before a view has been created.
     // So just log a warning instead of a NOTREACHED().
     DLOG(WARNING) << "Stop: no view for handle ";
     return;
   }
 
   view->Stop();
 }
 
@@ skipping 41 matching lines @@
                                          directoryPath,
                                          savePackageType);
 }
 
 - (void)handlesCloseScriptCommand:(NSScriptCommand*)command {
   TabContents* contents = tabContents_->tab_contents();
   contents->delegate()->CloseContents(contents);
 }
 
 - (void)handlesViewSourceScriptCommand:(NSScriptCommand*)command {
-  NavigationEntry* entry = tabContents_->controller().GetLastCommittedEntry();
+  NavigationEntry* entry =
+      tabContents_->tab_contents()->controller().GetLastCommittedEntry();
   if (entry) {
     tabContents_->tab_contents()->OpenURL(
         GURL(chrome::kViewSourceScheme + std::string(":") +
              entry->url().spec()),
         GURL(),
         NEW_FOREGROUND_TAB,
         content::PAGE_TRANSITION_LINK);
   }
 }
 
 - (id)handlesExecuteJavascriptScriptCommand:(NSScriptCommand*)command {
-  RenderViewHost* view = tabContents_->render_view_host();
+  RenderViewHost* view = tabContents_->tab_contents()->render_view_host();
   if (!view) {
     NOTREACHED();
     return nil;
   }
 
   string16 script = base::SysNSStringToUTF16(
       [[command evaluatedArguments] objectForKey:@"javascript"]);
   Value* value = view->ExecuteJavascriptAndGetValue(string16(), script);
   NSAppleEventDescriptor* descriptor = valueToDescriptor(value);
   return [[[AnyResultValue alloc] initWithDescriptor:descriptor] autorelease];
 }
 
 @end