chrome_remote_control: Fix osx browser discovery

tools/chrome_remote_control/chrome_remote_control/desktop_browser_finder_unittest.py

 # 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.
 import unittest
 import browser
 import browser_options
 import desktop_browser_finder
 import os as real_os
 
 # This file verifies the logic for finding a browser instance on all platforms
@@ skipping 75 matching lines @@
   return len([x for x in array if x.type == type]) != 0
 
 class OSXFindTest(FindTestBase):
   def setUp(self):
     super(OSXFindTest, self).setUp()
     self._sys_stub.platform = 'darwin'
     self._files.append("/Applications/Google Chrome Canary.app/"
                        "Contents/MacOS/Google Chrome Canary")
     self._files.append("/Applications/Google Chrome.app/" +
                        "Contents/MacOS/Google Chrome")
+    self._files.append(
+      "../../../out/Release/Chromium.app/Contents/MacOS/Chromium")
+    self._files.append(
+      "../../../out/Debug/Chromium.app/Contents/MacOS/Chromium")
+    self._files.append(
+      "../../../out/Release/Content Shell.app/Contents/MacOS/Content Shell")
+    self._files.append(
+      "../../../out/Debug/Content Shell.app/Contents/MacOS/Content Shell")
 
-  def testFindCanaryWithBothPresent(self):
+  def testFindAll(self):
     types = self.DoFindAllTypes()
-    assert 'canary' in types
-    assert 'system' in types
-    assert len(types) == 2
-
-  def testFind(self):
-    browsers = self.DoFindAll()
-    self.assertTrue(has_type(browsers, 'canary'))
-    self.assertTrue(has_type(browsers, 'system'))
-
-    del self._files[0]
-    browsers = self.DoFindAll()
-    self.assertFalse(has_type(browsers, 'canary'))
-    self.assertTrue(has_type(browsers, 'system'))
+    self.assertEquals(
+      set(types),
+      set(['debug', 'release',
+           'content-shell-debug', 'content-shell-release',
+           'canary', 'system']))
 
 
 class LinuxFindTest(FindTestBase):
   def setUp(self):
     super(LinuxFindTest, self).setUp()
 
     self._sys_stub.platform = 'linux2'
     self._files.append("/foo/chrome")
     self._files.append("../../../out/Release/chrome")
     self._files.append("../../../out/Debug/chrome")
@@ skipping 61 matching lines @@
 
   def testFindAllWithExact(self):
     self._options.browser_executable = 'c:\\tmp\\chrome.exe'
     types = self.DoFindAllTypes()
     self.assertEquals(
         set(types),
         set(['exact',
              'debug', 'release',
              'content-shell-debug', 'content-shell-release',
              'system', 'canary']))