Revert r30541 since it's still breaking browser_tests

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

1 files changed, 29 insertions, 23 deletions

diff --git a/chrome/browser/browser_list.cc b/chrome/browser/browser_list.cc
index f934943..aba80b7 100644
--- a/chrome/browser/browser_list.cc
+++ b/chrome/browser/browser_list.cc
@@ -79,16 +79,6 @@ class BrowserActivityObserver : public NotificationObserver {
 
 BrowserActivityObserver* activity_observer = NULL;
 
-// Returns true if the specified |browser| has a matching profile and type to
-// those specified. |type| can also be TYPE_ANY, which means only |profile|
-// must be matched.
-bool BrowserMatchesProfileAndType(Browser* browser,
-                                  Profile* profile,
-                                  Browser::Type type) {
-  return (type == Browser::TYPE_ANY || browser->type() == type) &&
-      browser->profile() == profile;
-}
-
 }  // namespace
 
 BrowserList::list_type BrowserList::browsers_;
@@ -252,7 +242,7 @@ void BrowserList::WindowsSessionEnding() {
 bool BrowserList::HasBrowserWithProfile(Profile* profile) {
   BrowserList::const_iterator iter;
   for (size_t i = 0; i < browsers_.size(); ++i) {
-    if (BrowserMatchesProfileAndType(browsers_[i], profile, Browser::TYPE_ANY))
+    if (browsers_[i]->profile() == profile)
       return true;
   }
   return false;
@@ -282,28 +272,44 @@ Browser* BrowserList::GetLastActive() {
 Browser* BrowserList::GetLastActiveWithProfile(Profile* p) {
   list_type::reverse_iterator browser = last_active_browsers_.rbegin();
   for (; browser != last_active_browsers_.rend(); ++browser) {
-    if (BrowserMatchesProfileAndType(*browser, p, Browser::TYPE_ANY))
+    if ((*browser)->profile() == p) {
       return *browser;
+    }
   }
+
   return NULL;
 }
 
 // static
 Browser* BrowserList::FindBrowserWithType(Profile* p, Browser::Type t) {
-  list_type::reverse_iterator browser = last_active_browsers_.rbegin();
-  for (; browser != last_active_browsers_.rend(); ++browser) {
-    if (BrowserMatchesProfileAndType(*browser, p, t))
-      return *browser;
+  Browser* last_active = GetLastActive();
+  if (last_active && last_active->profile() == p && last_active->type() == t)
+    return last_active;
+
+  BrowserList::const_iterator i;
+  for (i = BrowserList::begin(); i != BrowserList::end(); ++i) {
+    if (*i == last_active)
+      continue;
+
+    if ((*i)->profile() == p && (*i)->type() == t)
+      return *i;
   }
   return NULL;
 }
 
 // static
 Browser* BrowserList::FindBrowserWithProfile(Profile* p) {
-  list_type::reverse_iterator browser = last_active_browsers_.rbegin();
-  for (; browser != last_active_browsers_.rend(); ++browser) {
-    if (BrowserMatchesProfileAndType(*browser, p, Browser::TYPE_ANY))
-      return *browser;
+  Browser* last_active = GetLastActive();
+  if (last_active && last_active->profile() == p)
+    return last_active;
+
+  BrowserList::const_iterator i;
+  for (i = BrowserList::begin(); i != BrowserList::end(); ++i) {
+    if (*i == last_active)
+      continue;
+
+    if ((*i)->profile() == p)
+      return *i;
   }
   return NULL;
 }
@@ -323,8 +329,8 @@ size_t BrowserList::GetBrowserCountForType(Profile* p, Browser::Type type) {
   BrowserList::const_iterator i;
   size_t result = 0;
   for (i = BrowserList::begin(); i != BrowserList::end(); ++i) {
-    if (BrowserMatchesProfileAndType(*i, p, type))
-      ++result;
+    if ((*i)->profile() == p && (*i)->type() == type)
+      result++;
   }
   return result;
 }
@@ -334,7 +340,7 @@ size_t BrowserList::GetBrowserCount(Profile* p) {
   BrowserList::const_iterator i;
   size_t result = 0;
   for (i = BrowserList::begin(); i != BrowserList::end(); ++i) {
-    if (BrowserMatchesProfileAndType(*i, p, Browser::TYPE_ANY))
+    if ((*i)->profile() == p)
       result++;
   }
   return result;