Rename TabContents::controller() to GetController and put it into the WebContents interface.

chrome/browser/ui/webui/sync_promo/sync_promo_handler.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/ui/webui/sync_promo/sync_promo_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
@@ skipping 72 matching lines @@
 }
 
 WebUIMessageHandler* SyncPromoHandler::Attach(WebUI* web_ui) {
   DCHECK(web_ui);
   // Keep a reference to the preferences service for convenience and it's
   // probably a little faster that getting it via Profile::FromWebUI() every
   // time we need to interact with preferences.
   prefs_ = Profile::FromWebUI(web_ui)->GetPrefs();
   DCHECK(prefs_);
   // Ignore events from view-source:chrome://syncpromo.
-  if (!web_ui->tab_contents()->controller().GetActiveEntry()->
+  if (!web_ui->tab_contents()->GetController().GetActiveEntry()->
           IsViewSourceMode()) {
     // Listen to see if the tab we're in gets closed.
     registrar_.Add(this, content::NOTIFICATION_TAB_CLOSING,
         content::Source<NavigationController>(
-            &web_ui->tab_contents()->controller()));
+            &web_ui->tab_contents()->GetController()));
     // Listen to see if the window we're in gets closed.
     registrar_.Add(this, chrome::NOTIFICATION_BROWSER_CLOSING,
         content::NotificationService::AllSources());
   }
   return SyncSetupHandler::Attach(web_ui);
 }
 
 void SyncPromoHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("SyncPromo:Close",
       base::Bind(&SyncPromoHandler::HandleCloseSyncPromo,
@@ skipping 176 matching lines @@
   int adjusted = GetViewCount() + amount;
   prefs_->SetInteger(prefs::kSyncPromoViewCount, adjusted);
   return adjusted;
 }
 
 void SyncPromoHandler::RecordUserFlowAction(int action) {
   // Send an enumeration to our single user flow histogram.
   UMA_HISTOGRAM_ENUMERATION("SyncPromo.UserFlow", action,
                             SYNC_PROMO_BUCKET_BOUNDARY);
 }