Context menu egtests, plus related utilities.

ios/web/public/test/earl_grey/web_view_matchers.mm

 // 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 "ios/web/public/test/earl_grey/web_view_matchers.h"
 
-#include <memory>
-
 #import <WebKit/WebKit.h>
 
 #include "base/mac/bind_objc_block.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/ios/wait_util.h"
 #include "base/values.h"
 #include "ios/testing/earl_grey/wait_util.h"
+#import "ios/web/public/test/web_view_interaction_test_util.h"
+
+using web::test::ExecuteJavaScript;
 
 namespace {
 
 // Script that returns document.body as a string.
 char kGetDocumentBodyJavaScript[] =
     "document.body ? document.body.textContent : null";
 // Script that tests presence of css selector.
 char kTestCssSelectorJavaScriptTemplate[] = "!!document.querySelector(\"%s\");";
 
-// Synchronously returns the result of executed JavaScript.
-std::unique_ptr<base::Value> ExecuteScript(web::WebState* web_state,
-                                           const std::string& script) {
-  __block std::unique_ptr<base::Value> result;
-  __block bool did_finish = false;
-  web_state->ExecuteJavaScript(base::UTF8ToUTF16(script),
-                               base::BindBlock(^(const base::Value* value) {
-                                 if (value)
-                                   result = value->CreateDeepCopy();
-                                 did_finish = true;
-                               }));
-
-  testing::WaitUntilCondition(testing::kWaitForJSCompletionTimeout, ^{
-    return did_finish;
-  });
-
-  // As result is marked __block, this return call does a copy and not a move
-  // (marking the variable as __block mean it is allocated in the block object
-  // and not the stack). Since the "return std::move()" pattern is discouraged
-  // use a local variable.
-  //
-  // Fixes the following compilation failure:
-  //   ../web_view_matchers.mm:ll:cc: error: call to implicitly-deleted copy
-  //       constructor of 'std::unique_ptr<base::Value>'
-  std::unique_ptr<base::Value> stack_result = std::move(result);
-  return stack_result;
-}
-
 }  // namespace
 
 namespace web {
 
 id<GREYMatcher> webViewInWebState(WebState* web_state) {
   MatchesBlock matches = ^BOOL(UIView* view) {
     return [view isKindOfClass:[WKWebView class]] &&
            [view isDescendantOfView:web_state->GetView()];
   };
 
   DescribeToBlock describe = ^(id<GREYDescription> description) {
     [description appendText:@"web view in web state"];
   };
 
   return [[[GREYElementMatcherBlock alloc] initWithMatchesBlock:matches
                                                descriptionBlock:describe]
       autorelease];
 }
 
-id<GREYMatcher> webViewContainingText(std::string text, WebState* web_state) {
+id<GREYMatcher> webViewContainingText(const std::string& text,

[Eugene But (OOO till 7-30), 2016/08/31 15:27:59]

This should be string by value or local variable (|text| is used inside the
block).

+                                      WebState* web_state) {
   MatchesBlock matches = ^BOOL(WKWebView*) {
     __block BOOL did_succeed = NO;
     NSDate* deadline =
         [NSDate dateWithTimeIntervalSinceNow:testing::kWaitForUIElementTimeout];
     while (([[NSDate date] compare:deadline] != NSOrderedDescending) &&
            !did_succeed) {
       std::unique_ptr<base::Value> value =
-          ExecuteScript(web_state, kGetDocumentBodyJavaScript);
+          ExecuteJavaScript(web_state, kGetDocumentBodyJavaScript);
       std::string body;
       if (value && value->GetAsString(&body)) {
         did_succeed = body.find(text) != std::string::npos;
       }
       base::test::ios::SpinRunLoopWithMaxDelay(
           base::TimeDelta::FromSecondsD(testing::kSpinDelaySeconds));
     }
     return did_succeed;
   };
 
   DescribeToBlock describe = ^(id<GREYDescription> description) {
     [description appendText:@"web view containing "];
     [description appendText:base::SysUTF8ToNSString(text)];
   };
 
   return grey_allOf(webViewInWebState(web_state),
                     [[[GREYElementMatcherBlock alloc]
                         initWithMatchesBlock:matches
                             descriptionBlock:describe] autorelease],
                     nil);
 }
 
-id<GREYMatcher> webViewContainingBlockedImage(std::string image_id,
+id<GREYMatcher> webViewContainingBlockedImage(const std::string& image_id,

[Eugene But (OOO till 7-30), 2016/08/31 15:27:59]

ditto

                                               CGSize expected_size,
                                               WebState* web_state) {
   MatchesBlock matches = ^BOOL(WKWebView*) {
     __block BOOL did_succeed = NO;
     NSDate* deadline =
         [NSDate dateWithTimeIntervalSinceNow:testing::kWaitForUIElementTimeout];
     while (([[NSDate date] compare:deadline] != NSOrderedDescending) &&
            !did_succeed) {
       NSString* const kGetElementAttributesScript = [NSString
           stringWithFormat:@"var image = document.getElementById('%@');"
                            @"var imageHeight = image.height;"
                            @"var imageWidth = image.width;"
                            @"JSON.stringify({"
                            @"  height:imageHeight,"
                            @"  width:imageWidth"
                            @"});",
                            base::SysUTF8ToNSString(image_id)];
-      std::unique_ptr<base::Value> value = ExecuteScript(
+      std::unique_ptr<base::Value> value = ExecuteJavaScript(
           web_state, base::SysNSStringToUTF8(kGetElementAttributesScript));
       std::string result;
       if (value && value->GetAsString(&result)) {
         NSString* evaluation_result = base::SysUTF8ToNSString(result);
         NSData* image_attributes_as_data =
             [evaluation_result dataUsingEncoding:NSUTF8StringEncoding];
         NSDictionary* image_attributes =
             [NSJSONSerialization JSONObjectWithData:image_attributes_as_data
                                             options:0
                                               error:nil];
@@ skipping 13 matching lines @@
     [description appendText:base::SysUTF8ToNSString(image_id)];
   };
 
   return grey_allOf(webViewInWebState(web_state),
                     [[[GREYElementMatcherBlock alloc]
                         initWithMatchesBlock:matches
                             descriptionBlock:describe] autorelease],
                     nil);
 }
 
-id<GREYMatcher> webViewCssSelector(std::string selector, WebState* web_state) {
+id<GREYMatcher> webViewCssSelector(const std::string& selector,

[Eugene But (OOO till 7-30), 2016/08/31 15:27:59]

ditto

+                                   WebState* web_state) {
   MatchesBlock matches = ^BOOL(WKWebView*) {
     std::string script = base::StringPrintf(kTestCssSelectorJavaScriptTemplate,
                                             selector.c_str());
     __block bool did_succeed = false;
     NSDate* deadline =
         [NSDate dateWithTimeIntervalSinceNow:testing::kWaitForUIElementTimeout];
     while (([[NSDate date] compare:deadline] != NSOrderedDescending) &&
            !did_succeed) {
-      std::unique_ptr<base::Value> value = ExecuteScript(web_state, script);
+      std::unique_ptr<base::Value> value = ExecuteJavaScript(web_state, script);
       if (value)
         value->GetAsBoolean(&did_succeed);
       base::test::ios::SpinRunLoopWithMaxDelay(
           base::TimeDelta::FromSecondsD(testing::kSpinDelaySeconds));
     }
     return did_succeed;
   };
 
   DescribeToBlock describe = ^(id<GREYDescription> description) {
     [description appendText:@"web view selector "];
@@ skipping 17 matching lines @@
   DescribeToBlock describe = ^(id<GREYDescription> description) {
     [description appendText:@"web view scroll view"];
   };
 
   return [[[GREYElementMatcherBlock alloc] initWithMatchesBlock:matches
                                                descriptionBlock:describe]
       autorelease];
 }
 
 }  // namespace web