Refactor web shell integration tests utilities.

ios/web/shell/test/shell_matchers.h

Index: ios/web/shell/test/shell_matchers.h
diff --git a/ios/web/shell/test/shell_matchers.h b/ios/web/shell/test/shell_matchers.h
deleted file mode 100644
index 2405d8d3f6aa33afc8474f14b332ddae8a689ab7..0000000000000000000000000000000000000000
--- a/ios/web/shell/test/shell_matchers.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// 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.
-
-#import <EarlGrey/EarlGrey.h>
-
-namespace web {
-
-// Shorthand for GREYMatchers::matcherForBackButton.
-id<GREYMatcher> backButton();

[Eugene But (OOO till 7-30), 2016/05/05 18:01:11]

Why? This is useful stuff....

[baxley, 2016/05/05 18:33:18]

It's still there, I moved it to ios/web/shell/test/earl_grey/shell_matchers.h.
The diff didn't figure it out.

[Eugene But (OOO till 7-30), 2016/05/05 18:50:31]

Sorry. I can read, I promise...

[baxley, 2016/05/05 21:13:53]

:)

-
-// Shorthand for GREYMatchers::matcherForForwardButton.
-id<GREYMatcher> forwardButton();
-
-// Shorthand for GREYMatchers::matcherForAddressField.
-id<GREYMatcher> addressField();
-
-}  // namespace web
-
-@interface GREYMatchers (WebShellAdditions)
-
-// Matcher for back button in web shell.
-+ (id<GREYMatcher>)matcherForWebShellBackButton;
-
-// Matcher for forward button in web shell.
-+ (id<GREYMatcher>)matcherForWebShellForwardButton;
-
-// Matcher for address field in web shell.
-+ (id<GREYMatcher>)matcherForWebShellAddressField;
-
-@end