Move infobar handling to a tab helper.

chrome/browser/google/google_url_tracker.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/google/google_url_tracker.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google/google_util.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 InfoBarDelegate* CreateInfobar(TabContents* tab_contents,
                                GoogleURLTracker* google_url_tracker,
                                const GURL& new_google_url) {
   InfoBarDelegate* infobar = new GoogleURLTrackerInfoBarDelegate(tab_contents,
       google_url_tracker, new_google_url);
   TabContentsWrapper* wrapper =

[Peter Kasting, 2011/08/31 18:47:32]

Nit: Just combine these two lines

       TabContentsWrapper::GetCurrentWrapperForContents(tab_contents);
-  wrapper->AddInfoBar(infobar);
+  wrapper->infobar_tab_helper()->AddInfoBar(infobar);
   return infobar;
 }
 
 }  // namespace
 
 // GoogleURLTrackerInfoBarDelegate --------------------------------------------
 
 GoogleURLTrackerInfoBarDelegate::GoogleURLTrackerInfoBarDelegate(
     TabContents* tab_contents,
     GoogleURLTracker* google_url_tracker,
@@ skipping 326 matching lines @@
 }
 
 void GoogleURLTracker::ShowGoogleURLInfoBarIfNecessary(
     TabContents* tab_contents) {
   if (!need_to_prompt_)
     return;
   DCHECK(!fetched_google_url_.is_empty());
 
   infobar_ = (*infobar_creator_)(tab_contents, this, fetched_google_url_);
 }