Revert 182991

tools/telemetry/telemetry/__init__.py

Index: tools/telemetry/telemetry/__init__.py
===================================================================
--- tools/telemetry/telemetry/__init__.py	(revision 182999)
+++ tools/telemetry/telemetry/__init__.py	(working copy)
@@ -1,4 +1,30 @@
 # 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.
-"""A library for cross-platform browser tests."""
+"""A library for chrome-based tests.
+
+"""
+from telemetry.browser import Browser
+from telemetry.browser_finder import FindBrowser
+from telemetry.browser_finder import GetAllAvailableBrowserTypes
+from telemetry.browser_gone_exception import BrowserGoneException
+from telemetry.browser_options import BrowserOptions
+from telemetry.tab import Tab
+from telemetry.tab_crash_exception import TabCrashException
+from telemetry.util import TimeoutException, WaitFor
+
+def CreateBrowser(browser_type):
+  """Shorthand way to create a browser of a given type
+
+  However, note that the preferred way to create a browser is:
+     options = BrowserOptions()
+     _, leftover_args, = options.CreateParser().parse_args()
+     browser_to_create = FindBrowser(options)
+     return browser_to_create.Create()
+
+  as it creates more opportunities for customization and
+  error handling."""
+  browser_to_create = FindBrowser(BrowserOptions(browser_type))
+  if not browser_to_create:
+    raise Exception('No browser of type %s found' % browser_type)
+  return browser_to_create.Create()