| Index: chrome/browser/tab_restore_uitest.cc
 | 
| ===================================================================
 | 
| --- chrome/browser/tab_restore_uitest.cc	(revision 30285)
 | 
| +++ chrome/browser/tab_restore_uitest.cc	(working copy)
 | 
| @@ -226,8 +226,7 @@
 | 
|    EXPECT_EQ(starting_tab_count + 2, tab_count);
 | 
|  
 | 
|    // Create a new browser.
 | 
| -  ASSERT_TRUE(automation()->OpenNewBrowserWindow(BrowserProxy::TYPE_NORMAL,
 | 
| -                                                 false));
 | 
| +  ASSERT_TRUE(automation()->OpenNewBrowserWindow(Browser::TYPE_NORMAL, false));
 | 
|    int window_count;
 | 
|    ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
 | 
|    EXPECT_EQ(2, window_count);
 | 
| @@ -269,8 +268,7 @@
 | 
|    tab_proxy->NavigateToURL(url2_);
 | 
|  
 | 
|    // Create a new browser.
 | 
| -  ASSERT_TRUE(automation()->OpenNewBrowserWindow(BrowserProxy::TYPE_NORMAL,
 | 
| -                                                 false));
 | 
| +  ASSERT_TRUE(automation()->OpenNewBrowserWindow(Browser::TYPE_NORMAL, false));
 | 
|    int window_count;
 | 
|    ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
 | 
|    EXPECT_EQ(2, window_count);
 | 
| @@ -360,8 +358,7 @@
 | 
|    EXPECT_EQ(starting_tab_count + 2, tab_count);
 | 
|  
 | 
|    // Create a new browser.
 | 
| -  ASSERT_TRUE(automation()->OpenNewBrowserWindow(BrowserProxy::TYPE_NORMAL,
 | 
| -                                                 false));
 | 
| +  ASSERT_TRUE(automation()->OpenNewBrowserWindow(Browser::TYPE_NORMAL, false));
 | 
|    int window_count;
 | 
|    ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
 | 
|    EXPECT_EQ(2, window_count);
 | 
| @@ -409,8 +406,7 @@
 | 
|    tab_proxy->NavigateToURL(url2_);
 | 
|  
 | 
|    // Create a new browser.
 | 
| -  ASSERT_TRUE(automation()->OpenNewBrowserWindow(BrowserProxy::TYPE_NORMAL,
 | 
| -                                                 false));
 | 
| +  ASSERT_TRUE(automation()->OpenNewBrowserWindow(Browser::TYPE_NORMAL, false));
 | 
|    int window_count;
 | 
|    ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
 | 
|    EXPECT_EQ(2, window_count);
 | 
| @@ -552,8 +548,7 @@
 | 
|    // Create a new window.
 | 
|    int window_count;
 | 
|    ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
 | 
| -  ASSERT_TRUE(automation()->OpenNewBrowserWindow(BrowserProxy::TYPE_NORMAL,
 | 
| -                                                 false));
 | 
| +  ASSERT_TRUE(automation()->OpenNewBrowserWindow(Browser::TYPE_NORMAL, false));
 | 
|    int new_window_count = 0;
 | 
|    ASSERT_TRUE(automation()->GetBrowserWindowCount(&new_window_count));
 | 
|    EXPECT_EQ(++window_count, new_window_count);
 | 
| 
 |