Attempt 2 at Moving Browser::AddTypes to TabStripModel. The first

attempt caused some flakiness on the new tab warm startup test. The
only difference between this and the last is that I'm leaving some
suspcious code in TabStripModel::InsertTabContents and
Browser::AddTabWithURL. I'll try to isolate why those changes caused
flakiness after I land the rest.

Here's the description:

Moves Browser::AddTypes to TabStripModel. This patch is primarily
cleanup before I fix 29933, but has a couple of interesting bits
beyond the enum change:
. AddTabContents now supports adding pinned.
. Converted InsertTabContents call in extensionstabmodule to pass in
  nothing (Rafael said old code was wrong).

BUG=29933
TEST=none
TBR=ben@chromium.org

Review URL: http://codereview.chromium.org/2866024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50981 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 4 deletions

diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index 93f7998..36fe2d5 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -261,7 +261,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, TabsRememberFocus) {
   // Create several tabs.
   for (int i = 0; i < 4; ++i) {
     browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, -1,
-                             Browser::ADD_SELECTED, NULL, std::string());
+                             TabStripModel::ADD_SELECTED, NULL, std::string());
   }
 
   // Alternate focus for the tab.
@@ -341,8 +341,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_TabsRememberFocusFindInPage) {
   browser()->FocusLocationBar();
 
   // Create a 2nd tab.
-  browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED,
-                           -1, Browser::ADD_SELECTED, NULL, std::string());
+  browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, -1,
+                           TabStripModel::ADD_SELECTED, NULL, std::string());
 
   // Focus should be on the recently opened tab page.
   ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
@@ -725,7 +725,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, TabInitialFocus) {
 
   // Open about:blank, focus should be on the location bar.
   browser()->AddTabWithURL(GURL("about:blank"), GURL(), PageTransition::LINK,
-                           -1, Browser::ADD_SELECTED, NULL, std::string());
+                           -1, TabStripModel::ADD_SELECTED, NULL,
+                           std::string());
   ASSERT_TRUE(IsViewFocused(VIEW_ID_LOCATION_BAR));
 }