commit 7fb57f7459ae98f5b96cc159c4f62dd17808ffa6
author Achuith Bhandarkar <achuith@chromium.org> Thu Aug 29 15:29:06 2013 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Mon Sep 02 20:04:21 2013 +0000
tree ff735a7d4fa75f5607af120ad2ea20279098594d
parent 5673093ae45dab25509f2046b269cc8ea4e9ad61

BrowserOptions has been renamed to BrowserFinderOptions.

The rename was done in crrev.com/219909

BUG=chromium:281385
TEST=trybot

Change-Id: I673fdc6b1063e69412f7e4ebcfa5cdbdccfbbfe2
Reviewed-on: https://chromium-review.googlesource.com/167511
Tested-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Commit-Queue: Achuith Bhandarkar <achuith@chromium.org>

client/common_lib/cros/chrome.py

diff --git a/client/common_lib/cros/chrome.py b/client/common_lib/cros/chrome.py
index 6c3a382..c8f9634 100644
--- a/client/common_lib/cros/chrome.py
+++ b/client/common_lib/cros/chrome.py
@@ -21,19 +21,19 @@
 
 
     def __init__(self, logged_in=True, extension_paths=[]):
-        options = browser_options.BrowserOptions()
+        finder_options = browser_options.BrowserFinderOptions()
         self._browser_type = (self.BROWSER_TYPE_LOGIN
                 if logged_in else self.BROWSER_TYPE_GUEST)
-        options.browser_type = self._browser_type
+        finder_options.browser_type = self._browser_type
 
         if logged_in:
             for path in extension_paths:
                 extension = extension_to_load.ExtensionToLoad(
                         path, self._browser_type, is_component=True)
-                options.extensions_to_load.append(extension)
-            self._extensions_to_load = options.extensions_to_load
+                finder_options.extensions_to_load.append(extension)
+            self._extensions_to_load = finder_options.extensions_to_load
 
-        browser_to_create = browser_finder.FindBrowser(options)
+        browser_to_create = browser_finder.FindBrowser(finder_options)
         self._browser = browser_to_create.Create()
         self._browser.Start()
 
@@ -80,7 +80,11 @@
 
 
     def did_browser_crash(self, func):
-        """Runs func, returns True if the browser crashed, False otherwise."""
+        """Runs func, returns True if the browser crashed, False otherwise.
+
+        @param func: function to run.
+
+        """
         try:
             func()
         except (exceptions.BrowserGoneException,