Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/tracker/test/attachment_helpers_test.py b/tracker/test/attachment_helpers_test.py
index 18e0efc..cbc7458 100644
--- a/tracker/test/attachment_helpers_test.py
+++ b/tracker/test/attachment_helpers_test.py
@@ -1,7 +1,6 @@
-# Copyright 2016 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 or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
"""Unittest for the tracker helpers module."""
from __future__ import print_function
@@ -11,7 +10,7 @@
from mock import Mock, patch
import unittest
-from proto import tracker_pb2
+from mrproto import tracker_pb2
from tracker import attachment_helpers
@@ -146,4 +145,3 @@
# Anything that is not a video.
attach.mimetype = 'audio/mp3'
self.assertIsNone(attachment_helpers.GetVideoURL(attach, download_url))
-