diff options
| author | jam <jam@chromium.org> | 2015-02-06 19:27:04 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-07 03:27:49 +0000 |
| commit | f43ab9ce5b48ed622736d96c9fba9e8fa57858a3 (patch) | |
| tree | e94f9bff211cfb6f7796769740ebb226637d5478 /android_webview/native | |
| parent | b60049a86e45b0160f378624c5dfd99d667c5262 (diff) | |
| download | chromium_src-f43ab9ce5b48ed622736d96c9fba9e8fa57858a3.zip chromium_src-f43ab9ce5b48ed622736d96c9fba9e8fa57858a3.tar.gz chromium_src-f43ab9ce5b48ed622736d96c9fba9e8fa57858a3.tar.bz2 | |
Revert of Enable libc++ on Android (patchset #16 id:460001 of https://codereview.chromium.org/835633003/)
Reason for revert:
Slows down the slowest bot on CQ by 20 minutes.
BUG=456396
Original issue's description:
> Enable libc++ on Android
>
> Switch Chrome on Android to use libc++ instead of stlport. WebView AOSP
> builds will continue to use stlport for the time being.
>
> Note that this change is exploratory, and likely to be reverted before
> branch point (ensuring WebView and Chrome remain in lockstep with
> respect to standard library dependencies).
>
> BUG=427718
> TBR=cpu@chromium.org
>
> Committed: https://crrev.com/8681920fa22ded465054301ce96657a4ddaf2a04
> Cr-Commit-Position: refs/heads/master@{#315085}
TBR=fdegans@chromium.org,pasko@chromium.org,jamesr@chromium.org,thakis@chromium.org,boliu@chromium.org,davidben@chromium.org,cpu@chromium.org,piman@chromium.org,jdduke@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=427718
Review URL: https://codereview.chromium.org/903323002
Cr-Commit-Position: refs/heads/master@{#315174}
Diffstat (limited to 'android_webview/native')
| -rw-r--r-- | android_webview/native/aw_contents.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc index a908d87..6c468f6 100644 --- a/android_webview/native/aw_contents.cc +++ b/android_webview/native/aw_contents.cc @@ -42,7 +42,6 @@ #include "base/memory/memory_pressure_listener.h" #include "base/message_loop/message_loop.h" #include "base/pickle.h" -#include "base/stl_util.h" #include "base/strings/string16.h" #include "base/supports_user_data.h" #include "components/autofill/content/browser/content_autofill_driver_factory.h" @@ -844,7 +843,7 @@ jboolean AwContents::RestoreFromOpaqueState( std::vector<uint8> state_vector; base::android::JavaByteArrayToByteVector(env, state, &state_vector); - Pickle pickle(reinterpret_cast<const char*>(vector_as_array(&state_vector)), + Pickle pickle(reinterpret_cast<const char*>(state_vector.begin()), state_vector.size()); PickleIterator iterator(pickle); |