[Android] Upstream the WebView find-in-page API implementation.

android_webview/native/cookie_manager.cc

 // Copyright (c) 2011 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.
 
 #include "android_webview/native/cookie_manager.h"
 
 #include "android_webview/browser/aw_cookie_access_policy.h"
+#include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
 #include "android_webview/native/aw_browser_dependency_factory.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_options.h"
 #include "net/cookies/cookie_store.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "jni/CookieManager_jni.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertJavaStringToUTF16;
 using content::BrowserThread;
 using net::CookieList;
 using net::CookieMonster;
 using net::URLRequestContextGetter;
 
-// This class is only available when building the chromium back-end for andriod
-// webview: it is required where API backward compatibility demands that the UI
-// thread must block waiting on other threads e.g. to obtain a synchronous
-// return value. Long term, asynchronous overloads of all such methods will be
-// added in the public API, and and no new uses of this will be allowed.
-class ScopedAllowWaitForLegacyWebViewApi {
- private:
-  base::ThreadRestrictions::ScopedAllowWait wait;
-};
-
 // CookieManager should be refactored to not require all tasks accessing the
 // CookieStore to be piped through the IO thread.  It is currently required as
 // the URLRequestContext provides the easiest mechanism for accessing the
 // CookieStore, but the CookieStore is threadsafe.  In the future, we may
 // instead want to inject an explicit CookieStore dependency into this object
 // during process initialization to avoid depending on the URLRequestContext.
 //
 // In addition to the IO thread being the easiest access mechanism, it is also
 // used because the async cookie tasks need to be processed on a different
 // thread than the caller from Java, which can be any thread.  But, the calling
@@ skipping 245 matching lines @@
                                        jboolean accept) {
   ExecCookieTask(base::Bind(&SetAcceptFileSchemeCookiesAsyncHelper, accept),
                  true);
 }
 
 bool RegisterCookieManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // android_webview namespace