cocoa/bookmarks: Do not rely on Browser::tabstrip_model() accessor.

chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.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/bookmarks/bookmark_all_tabs_controller.h"
 
 #include "base/string16.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
@@ skipping 26 matching lines @@
   [self setInitialName:
       l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME)];
   [super awakeFromNib];
 }
 
 #pragma mark Bookmark Editing
 
 - (void)UpdateActiveTabPairs {
   activeTabPairsVector_.clear();
   Browser* browser = BrowserList::GetLastActive();
-  TabStripModel* tabstrip_model = browser->tabstrip_model();
-  const int tabCount = tabstrip_model->count();
+  const int tabCount = browser->tab_count();
   for (int i = 0; i < tabCount; ++i) {
-    WebContents* wc = tabstrip_model->GetTabContentsAt(i)->web_contents();
-    const string16 tabTitle = wc->GetTitle();
-    const GURL& tabURL(wc->GetURL());
-    ActiveTabNameURLPair tabPair(tabTitle, tabURL);
+    WebContents* wc = browser->GetWebContentsAt(i);

[Nico, 2012/04/30 15:23:47]

nit: The styleguide discourages abbreviations. Does `contents` work? (I know
that the old name was wc too)

[tfarina, 2012/04/30 16:59:12]

Done.

+    ActiveTabNameURLPair tabPair(wc->GetTitle(), wc->GetURL());
     activeTabPairsVector_.push_back(tabPair);
   }
 }
 
 // Called by -[BookmarkEditorBaseController ok:].  Creates the container
 // folder for the tabs and then the bookmarks in that new folder.
 // Returns a BOOL as an NSNumber indicating that the commit may proceed.
 - (NSNumber*)didCommit {
   NSString* name = [[self displayName] stringByTrimmingCharactersInSet:
                     [NSCharacterSet newlineCharacterSet]];
@@ skipping 19 matching lines @@
   }
   return [NSNumber numberWithBool:YES];
 }
 
 - (ActiveTabsNameURLPairVector*)activeTabPairsVector {
   return &activeTabPairsVector_;
 }
 
 @end  // BookmarkAllTabsController