Changes ui proxy classes to use Browser::Types rather than copying...

chrome/browser/sessions/session_restore_uitest.cc

 // Copyright (c) 2006-2008 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 "base/command_line.h"
 #include "base/file_path.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/defaults.h"
@@ skipping 249 matching lines @@
     return;  // Test only applicable if restoring popups.
 
   NavigateToURL(url1_);
 
   // Make sure we have one window.
   int window_count;
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
   ASSERT_EQ(1, window_count);
 
   // Open a popup.
-  ASSERT_TRUE(automation()->OpenNewBrowserWindow(BrowserProxy::TYPE_POPUP,
+  ASSERT_TRUE(automation()->OpenNewBrowserWindow(Browser::TYPE_POPUP,
                                                  true));
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
   ASSERT_EQ(2, window_count);
 
   // Restart and make sure we have only one window with one tab and the url
   // is url1_.
   QuitBrowserAndRestore(1);
 
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
   ASSERT_EQ(2, window_count);
 
   scoped_refptr<BrowserProxy> browser_proxy1(
       automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser_proxy1.get());
 
   scoped_refptr<BrowserProxy> browser_proxy2(
       automation()->GetBrowserWindow(1));
   ASSERT_TRUE(browser_proxy2.get());
 
-  BrowserProxy::Type type1, type2;
+  Browser::Type type1, type2;
   ASSERT_TRUE(browser_proxy1->GetType(&type1));
   ASSERT_TRUE(browser_proxy2->GetType(&type2));
 
   // The order of whether the normal window or popup is first depends upon
   // activation order, which is not necessarily consistant across runs.
-  if (type1 == BrowserProxy::TYPE_NORMAL) {
-    EXPECT_EQ(type2, BrowserProxy::TYPE_POPUP);
+  if (type1 == Browser::TYPE_NORMAL) {
+    EXPECT_EQ(type2, Browser::TYPE_POPUP);
   } else {
-    EXPECT_EQ(type1, BrowserProxy::TYPE_POPUP);
-    EXPECT_EQ(type2, BrowserProxy::TYPE_NORMAL);
+    EXPECT_EQ(type1, Browser::TYPE_POPUP);
+    EXPECT_EQ(type2, Browser::TYPE_NORMAL);
   }
 }
 
 
 #if defined(OS_WIN)
 // Creates a browser, goes incognito, closes browser, launches and make sure
 // we don't restore.
 TEST_F(SessionRestoreUITest, DontRestoreWhileIncognito) {
   NavigateToURL(url1_);
 
@@ skipping 39 matching lines @@
 // Creates two windows, closes one, restores, make sure only one window open.
 TEST_F(SessionRestoreUITest, TwoWindowsCloseOneRestoreOnlyOne) {
   NavigateToURL(url1_);
 
   // Make sure we have one window.
   int window_count;
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
   ASSERT_EQ(1, window_count);
 
   // Open a second window.
-  ASSERT_TRUE(automation()->OpenNewBrowserWindow(BrowserProxy::TYPE_NORMAL,
+  ASSERT_TRUE(automation()->OpenNewBrowserWindow(Browser::TYPE_NORMAL,
                                                  true));
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
   ASSERT_EQ(2, window_count);
 
   // Close it.
   CloseWindow(1, 2);
 
   // Restart and make sure we have only one window with one tab and the url
   // is url1_.
   QuitBrowserAndRestore(1);
@@ skipping 92 matching lines @@
   ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_timeout_ms()));
   tab_proxy = browser_proxy->GetTab(tab_count - 1);
   ASSERT_TRUE(tab_proxy.get() != NULL);
   ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_timeout_ms()));
 
   ASSERT_EQ(expected_process_count, GetBrowserProcessCount());
 }
 #endif
 
 }  // namespace