[Telemetry] Reorganize everything.

tools/telemetry/telemetry/browser_options_unittest.py

Index: tools/telemetry/telemetry/browser_options_unittest.py
diff --git a/tools/telemetry/telemetry/browser_options_unittest.py b/tools/telemetry/telemetry/browser_options_unittest.py
deleted file mode 100644
index c92c02a7a9dfd6641c60eea93a8407283abee19f..0000000000000000000000000000000000000000
--- a/tools/telemetry/telemetry/browser_options_unittest.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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
-
-from telemetry import browser_options
-
-class BrowserOptionsTest(unittest.TestCase):
-  def testDefaults(self):
-    options = browser_options.BrowserOptions()
-    parser = options.CreateParser()
-    parser.add_option('-x', action='store', default=3)
-    parser.parse_args(['--browser', 'any'])
-    self.assertEquals(options.x, 3) # pylint: disable=E1101
-
-  def testDefaultsPlusOverride(self):
-    options = browser_options.BrowserOptions()
-    parser = options.CreateParser()
-    parser.add_option('-x', action='store', default=3)
-    parser.parse_args(['--browser', 'any', '-x', 10])
-    self.assertEquals(options.x, 10) # pylint: disable=E1101
-
-  def testDefaultsDontClobberPresetValue(self):
-    options = browser_options.BrowserOptions()
-    setattr(options, 'x', 7)
-    parser = options.CreateParser()
-    parser.add_option('-x', action='store', default=3)
-    parser.parse_args(['--browser', 'any'])
-    self.assertEquals(options.x, 7) # pylint: disable=E1101
-
-  def testCount0(self):
-    options = browser_options.BrowserOptions()
-    parser = options.CreateParser()
-    parser.add_option('-x', action='count', dest='v')
-    parser.parse_args(['--browser', 'any'])
-    self.assertEquals(options.v, None) # pylint: disable=E1101
-
-  def testCount2(self):
-    options = browser_options.BrowserOptions()
-    parser = options.CreateParser()
-    parser.add_option('-x', action='count', dest='v')
-    parser.parse_args(['--browser', 'any', '-xx'])
-    self.assertEquals(options.v, 2) # pylint: disable=E1101
-
-  def testOptparseMutabilityWhenSpecified(self):
-    options = browser_options.BrowserOptions()
-    parser = options.CreateParser()
-    parser.add_option('-x', dest='verbosity', action='store_true')
-    options_ret, _ = parser.parse_args(['--browser', 'any', '-x'])
-    self.assertEquals(options_ret, options)
-    self.assertTrue(options.verbosity)
-
-  def testOptparseMutabilityWhenNotSpecified(self):
-    options = browser_options.BrowserOptions()
-
-    parser = options.CreateParser()
-    parser.add_option('-x', dest='verbosity', action='store_true')
-    options_ret, _ = parser.parse_args(['--browser', 'any'])
-    self.assertEquals(options_ret, options)
-    self.assertFalse(options.verbosity)