fixup! test(button-harness): add performance tests for buttons using the protractor harness env

Author: wagnermaciel

test/benchmarks/material/button-harness/app.module.ts

@@ -14,6 +14,7 @@ import {MatButtonModule} from '@angular/material/button';
 import {NUM_BUTTONS} from './constants';
 
 /** component: mat-button-harness-test */
+<<<<<<< HEAD
 
 @Component({
   selector: 'app-root',
@@ -31,6 +32,8 @@ import {NUM_BUTTONS} from './constants';
 >>>>>>> 72a4ae020 (fixup! test(button-harness): add performance tests for buttons using the protractor harness env)
 
 /** component: mat-raised-button-harness-test */
+=======
+>>>>>>> bf160e8de (fixup! test(button-harness): add performance tests for buttons using the protractor harness env)
 
 @Component({
   selector: 'app-root',

test/benchmarks/material/button-harness/protractor.perf-spec.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {HarnessLoader, HarnessPredicate} from '@angular/cdk/testing';
+import {HarnessLoader} from '@angular/cdk/testing';
 import {MatButtonHarness} from '@angular/material/button/testing/button-harness';
 import {ProtractorHarnessEnvironment} from '@angular/cdk/testing/protractor';
 import {$$, element, by, browser} from 'protractor';

test/benchmarks/material/button-harness/testbed.perf-spec.ts

@@ -111,7 +111,7 @@ describe('performance for the testbed harness environment', () => {
 @Component({
   template: `
     <button *ngFor="let val of vals" mat-button> {{ val }} </button>
-	`,
+  `,
 })
 export class ButtonHarnessTest {
   vals = Array.from({ length: NUM_BUTTONS }, (_, i) => i);