[polymer] Merge of master into polymer10-migration

telemetry/telemetry/internal/backends/browser_backend_unittest.py

 # Copyright 2015 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 os
 import tempfile
 import unittest
 
 from telemetry.internal.backends import browser_backend
 from telemetry.testing import options_for_unittests
@@ skipping 12 matching lines @@
       class FakeBrowserBackend(browser_backend.BrowserBackend):
         @property
         def supports_uploading_logs(self):
           return True
 
         @property
         def log_file_path(self):
           return temp_file_name
 
       options = options_for_unittests.GetCopy()
-      options.browser_options.enable_logging = True
+      options.browser_options.logging_verbosity = (
+          options.browser_options.VERBOSE_LOGGING)
       options.browser_options.logs_cloud_bucket = 'ABC'
       options.browser_options.logs_cloud_remote_path = 'def'
 
       b = FakeBrowserBackend(None, False, options.browser_options, None)
       self.assertEquals(b.GetLogFileContents(), 'This is a\ntest log file.\n')
       with mock.patch('catapult_base.cloud_storage.Insert') as mock_insert:
         b.UploadLogsToCloudStorage()
         mock_insert.assert_called_with(
             bucket='ABC', remote_path='def', local_path=temp_file_name)
     finally:
       os.remove(temp_file_name)