Fix the browser match rules.

chrome/browser/ui/browser_finder.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/browser_finder.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 24 matching lines @@
 // . If it contains kMatchOriginalProfile then the original profile of the
 //   browser must match |profile->GetOriginalProfile()|. This is used to match
 //   incognito windows.
 // . If it contains kMatchCanSupportWindowFeature
 //   |CanSupportWindowFeature(window_feature)| must return true.
 // . If it contains kMatchTabbed, the browser must be a tabbed browser.
 bool BrowserMatches(Browser* browser,
                     Profile* profile,
                     Browser::WindowFeature window_feature,
                     uint32 match_types) {
-  if (match_types & kMatchCanSupportWindowFeature &&
+  if ((match_types & kMatchCanSupportWindowFeature) &&
       !browser->CanSupportWindowFeature(window_feature)) {
     return false;
   }
 
-  bool matches_profile = browser->profile() == profile;
 #if defined(OS_CHROMEOS)
   // Get the profile on which the window is currently shown.
   // MultiUserWindowManager might be NULL under test scenario.
   chrome::MultiUserWindowManager* const window_manager =
       chrome::MultiUserWindowManager::GetInstance();
+  Profile* shown_profile = nullptr;
   if (window_manager) {
     const std::string& shown_user_id = window_manager->GetUserPresentingWindow(
         browser->window()->GetNativeWindow());
-    Profile* shown_profile =
-        shown_user_id.empty()
-            ? nullptr
-            : multi_user_util::GetProfileFromUserID(shown_user_id);
-    matches_profile &= !shown_profile || shown_profile == profile;
+    shown_profile = shown_user_id.empty()
+                        ? nullptr
+                        : multi_user_util::GetProfileFromUserID(shown_user_id);
   }
 #endif
 
   if (match_types & kMatchOriginalProfile) {
     if (browser->profile()->GetOriginalProfile() !=
         profile->GetOriginalProfile())
       return false;
-  } else if (!matches_profile) {
-    return false;
+#if defined(OS_CHROMEOS)
+    if (shown_profile &&
+        shown_profile->GetOriginalProfile() != profile->GetOriginalProfile()) {
+      return false;
+    }
+#endif
+  } else {
+    if (browser->profile() != profile)
+      return false;
+#if defined(OS_CHROMEOS)
+    if (shown_profile && shown_profile != profile)
+      return false;
+#endif
   }
 
   if (match_types & kMatchTabbed)
     return browser->is_type_tabbed();
 
   return true;
 }
 
 // Returns the first browser in the specified iterator that returns true from
 // |BrowserMatches|, or null if no browsers match the arguments. See
@@ skipping 141 matching lines @@
 
 size_t GetBrowserCount(Profile* profile, HostDesktopType type) {
   return GetBrowserCountImpl(profile, type, kMatchAny);
 }
 
 size_t GetTabbedBrowserCount(Profile* profile, HostDesktopType type) {
   return GetBrowserCountImpl(profile, type, kMatchTabbed);
 }
 
 }  // namespace chrome