Refactor web shell integration tests utilities.

ios/web/shell/test/app/web_shell_test_util.mm

Index: ios/web/shell/test/app/web_shell_test_util.mm
diff --git a/ios/web/shell/test/web_shell_test_util.h b/ios/web/shell/test/app/web_shell_test_util.mm
similarity index 52%
rename from ios/web/shell/test/web_shell_test_util.h
rename to ios/web/shell/test/app/web_shell_test_util.mm
index 4b528978cae9de36bc96e5645baf6df99a4e21be..975ec1400276876e83c7bd2c2b865589cb0b5c35 100644
--- a/ios/web/shell/test/web_shell_test_util.h
+++ b/ios/web/shell/test/app/web_shell_test_util.mm
@@ -2,18 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_WEB_SHELL_TEST_WEB_SHELL_TEST_UTIL_H_
-#define IOS_WEB_SHELL_TEST_WEB_SHELL_TEST_UTIL_H_
+#import "ios/web/shell/test/app/web_shell_test_util.h"
+
+#include <UIKit/UIKit.h>

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

s/include/import

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

Done.

 
 #import "ios/web/shell/view_controller.h"
 
 namespace web {
 namespace web_shell_test_util {
 
-// Gets the current ViewController for the web shell.
-ViewController* GetCurrentViewController();
+web::WebState* GetCurrentWebState() {
+  ViewController* view_controller = (ViewController*)[

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

Missed this last time. Use static_cast instead of C-Style cast.

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

Done.

+      [[[UIApplication sharedApplication] delegate] window] rootViewController];
+  return view_controller.webState;
+}
 
 }  // namespace web_shell_test_util
 }  // namespace web
-
-#endif  // IOS_WEB_SHELL_TEST_WEB_SHELL_TEST_UTIL_H_