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

chrome/browser/tabs/pinned_tab_codec.cc

 // 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.
 
 #include "chrome/browser/tabs/pinned_tab_codec.h"
 
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 35 matching lines @@
     const Extension* extension =
         tab_contents->extension_tab_helper()->extension_app();
     DCHECK(extension);
     value->SetString(kAppID, extension->id());
     // For apps we use the launch url. We do this for the following reason:
     // . the user is effectively restarting the app, so that returning them to
     //   the app's launch page seems closest to what they expect.
     value->SetString(kURL, extension->GetFullLaunchURL().spec());
     values->Append(value.release());
   } else {
-    NavigationEntry* entry = tab_contents->controller().GetActiveEntry();
-    if (!entry && tab_contents->controller().entry_count())
-      entry = tab_contents->controller().GetEntryAtIndex(0);
+    NavigationEntry* entry =
+        tab_contents->tab_contents()->controller().GetActiveEntry();
+    if (!entry && tab_contents->tab_contents()->controller().entry_count())
+      entry = tab_contents->tab_contents()->controller().GetEntryAtIndex(0);
     if (entry) {
       value->SetString(kURL, entry->url().spec());
       values->Append(value.release());
     }
   }
 }
 
 // Invokes EncodePinnedTab for each pinned tab in browser.
 static void EncodePinnedTabs(Browser* browser, ListValue* values) {
   TabStripModel* tab_model = browser->tabstrip_model();
@@ skipping 56 matching lines @@
   for (size_t i = 0, max = pref_value->GetSize(); i < max; ++i) {
     DictionaryValue* values = NULL;
     if (pref_value->GetDictionary(i, &values)) {
       Tab tab;
       if (DecodeTab(*values, &tab))
         results.push_back(tab);
     }
   }
   return results;
 }