Browser::Type cleanup.

BUG=None
TEST=Existing tests

R=ben@chromium.org,stevenjb@chromium.org,phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/6697032

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

7 files changed, 20 insertions, 33 deletions

diff --git a/chrome/browser/sync/glue/session_model_associator.cc b/chrome/browser/sync/glue/session_model_associator.cc
index 1244508..e7e5c58a 100644
--- a/chrome/browser/sync/glue/session_model_associator.cc
+++ b/chrome/browser/sync/glue/session_model_associator.cc
@@ -122,7 +122,7 @@ void SessionModelAssociator::ReassociateWindows(bool reload_tabs) {
     // for us to get a handle to a browser that is about to be removed. If
     // the tab count is 0 or the window is NULL, the browser is about to be
     // deleted, so we ignore it.
-    if (ShouldSyncWindowType((*i)->type()) && (*i)->tab_count() &&
+    if (ShouldSyncWindow(*i) && (*i)->tab_count() &&
         (*i)->window()) {
       sync_pb::SessionWindow window_s;
       SessionID::id_type window_id = (*i)->session_id().id();
@@ -130,10 +130,9 @@ void SessionModelAssociator::ReassociateWindows(bool reload_tabs) {
           (*i)->tab_count() << " tabs.";
       window_s.set_window_id(window_id);
       window_s.set_selected_tab_index((*i)->active_index());
-      if ((*i)->type() ==
-          Browser::TYPE_NORMAL) {
+      if ((*i)->is_type_tabbed()) {
         window_s.set_browser_type(
-            sync_pb::SessionWindow_BrowserType_TYPE_NORMAL);
+            sync_pb::SessionWindow_BrowserType_TYPE_TABBED);
       } else {
         window_s.set_browser_type(
             sync_pb::SessionWindow_BrowserType_TYPE_POPUP);
@@ -170,22 +169,10 @@ void SessionModelAssociator::ReassociateWindows(bool reload_tabs) {
 }
 
 // Static.
-bool SessionModelAssociator::ShouldSyncWindowType(const Browser::Type& type) {
-  switch (type) {
-    case Browser::TYPE_POPUP:
-      return true;
-    case Browser::TYPE_APP:
-      return false;
-    case Browser::TYPE_APP_POPUP:
-      return false;
-    case Browser::TYPE_DEVTOOLS:
-      return false;
-    case Browser::TYPE_APP_PANEL:
-      return false;
-    case Browser::TYPE_NORMAL:
-    default:
-      return true;
-  }
+bool SessionModelAssociator::ShouldSyncWindow(const Browser* browser) {
+  if (browser->is_app())
+    return false;
+  return browser->is_type_tabbed() || browser->is_type_popup();
 }
 
 void SessionModelAssociator::ReassociateTabs(
@@ -582,7 +569,7 @@ void SessionModelAssociator::PopulateSessionWindowFromSpecifics(
     session_window->selected_tab_index = specifics.selected_tab_index();
   if (specifics.has_browser_type()) {
     if (specifics.browser_type() ==
-        sync_pb::SessionWindow_BrowserType_TYPE_NORMAL) {
+        sync_pb::SessionWindow_BrowserType_TYPE_TABBED) {
       session_window->type = 1;
     } else {
       session_window->type = 2;
@@ -910,9 +897,9 @@ void SessionModelAssociator::PopulateSessionSpecificsWindow(
   DCHECK(CalledOnValidThread());
   session_window->set_window_id(window.window_id.id());
   session_window->set_selected_tab_index(window.selected_tab_index);
-  if (window.type == Browser::TYPE_NORMAL) {
+  if (window.type == Browser::TYPE_TABBED) {
     session_window->set_browser_type(
-      sync_pb::SessionWindow_BrowserType_TYPE_NORMAL);
+      sync_pb::SessionWindow_BrowserType_TYPE_TABBED);
   } else if (window.type == Browser::TYPE_POPUP) {
     session_window->set_browser_type(
       sync_pb::SessionWindow_BrowserType_TYPE_POPUP);
diff --git a/chrome/browser/sync/glue/session_model_associator.h b/chrome/browser/sync/glue/session_model_associator.h
index 28582e0..b975013 100644
--- a/chrome/browser/sync/glue/session_model_associator.h
+++ b/chrome/browser/sync/glue/session_model_associator.h
@@ -301,7 +301,7 @@ class SessionModelAssociator
   void DeleteForeignSessions();
 
   // Determine if a window is of a type we're interested in syncing.
-  static bool ShouldSyncWindowType(const Browser::Type& type);
+  static bool ShouldSyncWindow(const Browser* browser);
 
   // Build a sync tag from tab_node_id.
   static inline std::string TabIdToTag(
diff --git a/chrome/browser/sync/glue/session_model_associator_unittest.cc b/chrome/browser/sync/glue/session_model_associator_unittest.cc
index 693e65f..e04b02a 100644
--- a/chrome/browser/sync/glue/session_model_associator_unittest.cc
+++ b/chrome/browser/sync/glue/session_model_associator_unittest.cc
@@ -54,7 +54,7 @@ TEST_F(SessionModelAssociatorTest, IsValidSessionTab) {
 TEST_F(SessionModelAssociatorTest, PopulateSessionWindow) {
   sync_pb::SessionWindow window_s;
   window_s.add_tab(0);
-  window_s.set_browser_type(sync_pb::SessionWindow_BrowserType_TYPE_NORMAL);
+  window_s.set_browser_type(sync_pb::SessionWindow_BrowserType_TYPE_TABBED);
   window_s.set_selected_tab_index(1);
 
   std::string tag = "tag";
diff --git a/chrome/browser/sync/profile_sync_service_session_unittest.cc b/chrome/browser/sync/profile_sync_service_session_unittest.cc
index 475fd39..33f0baf 100644
--- a/chrome/browser/sync/profile_sync_service_session_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc
@@ -76,7 +76,7 @@ class ProfileSyncServiceSessionTest
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     SessionService* session_service = new SessionService(temp_dir_.path());
     helper_.set_service(session_service);
-    service()->SetWindowType(window_id_, Browser::TYPE_NORMAL);
+    service()->SetWindowType(window_id_, Browser::TYPE_TABBED);
     service()->SetWindowBounds(window_id_, window_bounds_, false);
     registrar_.Add(this, NotificationType::FOREIGN_SESSION_UPDATED,
         NotificationService::AllSources());
@@ -280,7 +280,7 @@ TEST_F(ProfileSyncServiceSessionTest, WriteForeignSessionToNode) {
   sync_pb::SessionHeader* header_s = meta_specifics.mutable_header();
   sync_pb::SessionWindow* window_s = header_s->add_window();
   window_s->add_tab(0);
-  window_s->set_browser_type(sync_pb::SessionWindow_BrowserType_TYPE_NORMAL);
+  window_s->set_browser_type(sync_pb::SessionWindow_BrowserType_TYPE_TABBED);
   window_s->set_selected_tab_index(1);
 
   sync_pb::SessionSpecifics tab_specifics;
diff --git a/chrome/browser/sync/protocol/proto_enum_conversions.cc b/chrome/browser/sync/protocol/proto_enum_conversions.cc
index 5d3c1d6..1d81529 100644
--- a/chrome/browser/sync/protocol/proto_enum_conversions.cc
+++ b/chrome/browser/sync/protocol/proto_enum_conversions.cc
@@ -23,9 +23,9 @@ namespace browser_sync {
 const char* GetBrowserTypeString(
     sync_pb::SessionWindow::BrowserType browser_type) {
   ASSERT_ENUM_BOUNDS(sync_pb::SessionWindow, BrowserType,
-                     TYPE_NORMAL, TYPE_POPUP);
+                     TYPE_TABBED, TYPE_POPUP);
   switch (browser_type) {
-    ENUM_CASE(sync_pb::SessionWindow, TYPE_NORMAL);
+    ENUM_CASE(sync_pb::SessionWindow, TYPE_TABBED);
     ENUM_CASE(sync_pb::SessionWindow, TYPE_POPUP);
   }
   NOTREACHED();
diff --git a/chrome/browser/sync/protocol/session_specifics.proto b/chrome/browser/sync/protocol/session_specifics.proto
index bfed4aa..28ffbd9 100644
--- a/chrome/browser/sync/protocol/session_specifics.proto
+++ b/chrome/browser/sync/protocol/session_specifics.proto
@@ -33,12 +33,12 @@ message SessionWindow {
   // Index of the selected tab in tabs; -1 if no tab is selected.
   optional int32 selected_tab_index = 2 [default = -1];
   // Type of the browser. Currently we only store browsers of type
-  // TYPE_NORMAL and TYPE_POPUP.
+  // TYPE_TABBED and TYPE_POPUP.
   enum BrowserType {
-    TYPE_NORMAL = 1;
+    TYPE_TABBED = 1;
     TYPE_POPUP = 2;
   }
-  optional BrowserType browser_type = 3 [default = TYPE_NORMAL];
+  optional BrowserType browser_type = 3 [default = TYPE_TABBED];
   // The tabs that compose a window (correspond to tab id's).
   repeated int32 tab = 4;
 }
diff --git a/chrome/browser/sync/sync_setup_wizard_unittest.cc b/chrome/browser/sync/sync_setup_wizard_unittest.cc
index ef7acd0..073ca89 100644
--- a/chrome/browser/sync/sync_setup_wizard_unittest.cc
+++ b/chrome/browser/sync/sync_setup_wizard_unittest.cc
@@ -173,7 +173,7 @@ class SyncSetupWizardTest : public BrowserWithTestWindowTest {
     profile()->CreateBookmarkModel(false);
     // Wait for the bookmarks model to load.
     profile()->BlockUntilBookmarkModelLoaded();
-    set_browser(new Browser(Browser::TYPE_NORMAL, profile()));
+    set_browser(new Browser(Browser::TYPE_TABBED, profile()));
     test_window_ = new TestBrowserWindowForWizardTest(browser());
     set_window(test_window_);
     browser()->set_window(window());