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

them.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/343018

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

chrome/browser/sessions/session_restore_uitest.cc

@@ -267,7 +267,7 @@ TEST_F(SessionRestoreUITest, NormalAndPopup) {
   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);
@@ -287,17 +287,17 @@ TEST_F(SessionRestoreUITest, NormalAndPopup) {
       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);
   }
 }
 
@@ -357,7 +357,7 @@ TEST_F(SessionRestoreUITest, TwoWindowsCloseOneRestoreOnlyOne) {
   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);

chrome/browser/tab_restore_uitest.cc

@@ -226,8 +226,7 @@ TEST_F(TabRestoreUITest, FLAKY_RestoreToDifferentWindow) {
   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 @@ TEST_F(TabRestoreUITest, MAYBE_BasicRestoreFromClosedWindow) {
   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 @@ TEST_F(TabRestoreUITest, FLAKY_RestoreWindowAndTab) {
   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 @@ TEST_F(TabRestoreUITest, RestoreIntoSameWindow) {
   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 @@ TEST_F(TabRestoreUITest, RestoreWindow) {
   // 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);

chrome/chrome.gyp

@@ -3925,6 +3925,8 @@
         '..',
       ],
       'sources': [
+        # The only thing used from browser is Browser::Type.
+        'browser/browser.h',
         # TODO:  these should live here but are currently used by
         # production code code in libbrowser (above).
         #'browser/net/url_request_mock_http_job.cc',

chrome/test/automated_ui_tests/automated_ui_test_base.cc

@@ -261,7 +261,7 @@ bool AutomatedUITestBase::Home() {
 
 bool AutomatedUITestBase::OpenAndActivateNewBrowserWindow(
     scoped_refptr<BrowserProxy>* previous_browser) {
-  if (!automation()->OpenNewBrowserWindow(BrowserProxy::TYPE_NORMAL,
+  if (!automation()->OpenNewBrowserWindow(Browser::TYPE_NORMAL,
                                           true /* SW_SHOWNORMAL */)) {
     LogWarningMessage("failed_to_open_new_browser_window");
     return false;

chrome/test/automation/automation_proxy.cc

@@ -485,9 +485,8 @@ void AutomationProxy::InvalidateHandle(const IPC::Message& message) {
   }
 }
 
-bool AutomationProxy::OpenNewBrowserWindow(BrowserProxy::Type type,
-                                           bool show) {
-  if (type == BrowserProxy::TYPE_NORMAL)
+bool AutomationProxy::OpenNewBrowserWindow(Browser::Type type, bool show) {
+  if (type == Browser::TYPE_NORMAL)
     return Send(new AutomationMsg_OpenNewBrowserWindow(0, show));
   return Send(
       new AutomationMsg_OpenNewBrowserWindowOfType(0, static_cast<int>(type),

chrome/test/automation/automation_proxy.h

@@ -15,6 +15,7 @@
 #include "base/time.h"
 #include "base/thread.h"
 #include "base/waitable_event.h"
+#include "chrome/browser/browser.h"
 #include "chrome/test/automation/automation_constants.h"
 #include "chrome/test/automation/automation_handle_tracker.h"
 #include "chrome/test/automation/browser_proxy.h"
@@ -89,7 +90,7 @@ class AutomationProxy : public IPC::Channel::Listener,
 
   // Open a new browser window of type |type|, returning true on success. |show|
   // identifies whether the window should be shown. Returns true on success.
-  bool OpenNewBrowserWindow(BrowserProxy::Type type, bool show);
+  bool OpenNewBrowserWindow(Browser::Type type, bool show);
 
   // Fills the number of open browser windows into the given variable, returning
   // true on success. False likely indicates an IPC error.

chrome/test/automation/browser_proxy.cc

@@ -175,7 +175,7 @@ bool BrowserProxy::GetTabCountWithTimeout(int* num_tabs, uint32 timeout_ms,
   return succeeded;
 }
 
-bool BrowserProxy::GetType(Type* type) const {
+bool BrowserProxy::GetType(Browser::Type* type) const {
   if (!is_valid())
     return false;
 
@@ -188,23 +188,7 @@ bool BrowserProxy::GetType(Type* type) const {
   bool succeeded = sender_->SendWithTimeout(new AutomationMsg_Type(
       0, handle_, &type_as_int), base::kNoTimeout, NULL);
 
-  switch (type_as_int) {
-    case 0:
-      *type = TYPE_NORMAL;
-      break;
-    case 1:
-      *type = TYPE_POPUP;
-      break;
-    case 2:
-      *type = TYPE_APP;
-      break;
-    case 3:
-      *type = TYPE_APP_POPUP;
-      break;
-    default:
-      return false;
-  }
-
+  *type = static_cast<Browser::Type>(type_as_int);
   return succeeded;
 }
 

chrome/test/automation/browser_proxy.h

@@ -13,6 +13,7 @@
 
 #include <string>
 
+#include "chrome/browser/browser.h"
 #include "chrome/test/automation/automation_handle_tracker.h"
 
 class GURL;
@@ -31,13 +32,6 @@ namespace gfx {
 // any subsequent calls will return false immediately.
 class BrowserProxy : public AutomationResourceProxy {
  public:
-  enum Type {
-    TYPE_NORMAL = 0,
-    TYPE_POPUP = 1,
-    TYPE_APP = 2,
-    TYPE_APP_POPUP = TYPE_APP | TYPE_POPUP,
-  };
-
   BrowserProxy(AutomationMessageSender* sender,
                AutomationHandleTracker* tracker,
                int handle)
@@ -93,7 +87,7 @@ class BrowserProxy : public AutomationResourceProxy {
 
   // Returns the type of the given window. Returns true if the call was
   // successful.
-  bool GetType(Type* type) const;
+  bool GetType(Browser::Type* type) const;
 
   // Returns the TabProxy for the tab at the given index, transferring
   // ownership of the pointer to the caller. On failure, returns NULL.