Publish DEPS for Chromium 41.0.2272.53

• .DEPS.git[Added - diff]
• DEPS[diff]

Incrementing VERSION to 41.0.2272.53

Cr-Commit-Position: refs/branch-heads/2272@{#257}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/VERSION[diff]

Android: Get rid of extra dup()s on launching child processes

This is a regression from [1] which added a dup() call on
the renderer launching process. This CL removes these calls
by reveiling the subtle ownership of the file descriptors.

The original intention here was to completely hide and simplify
the notion of the ownership, at the cost of a few dup() calls.
However, the crash report on the reported bug indicates that
the dup() can fail and it lets the renderer initialization fail,
probably due to some per-process limit of the number of opened files.

[1] https://codereview.chromium.org/585203002

NOTRY=true
TBR=mdempsky@chromium.org, jam@chromium.org
BUG=455364

Review URL: https://codereview.chromium.org/909553003

Cr-Commit-Position: refs/heads/master@{#315353}
(cherry picked from commit f7302eb74f6e79d5b4e26ea5e9aa4e4eb81a52f1)

Review URL: https://codereview.chromium.org/908253002

Cr-Commit-Position: refs/branch-heads/2272@{#256}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• content/browser/android/child_process_launcher_android.cc[diff]
• content/browser/file_descriptor_info_impl.cc[diff]
• content/browser/file_descriptor_info_impl.h[diff]
• content/public/browser/file_descriptor_info.h[diff]

autofill: bumped pickle version of FormFieldData

Binary format was changed with
https://codereview.chromium.org/734983006.

BUG=450162

Review URL: https://codereview.chromium.org/800543009

Cr-Commit-Position: refs/heads/master@{#312388}
(cherry picked from commit 97dc995002ed64b09d7e49e43039ad243ff68bce)

Review URL: https://codereview.chromium.org/912883002

Cr-Commit-Position: refs/branch-heads/2272@{#255}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• components/autofill/core/common/form_field_data.cc[diff]
• components/autofill/core/common/form_field_data_unittest.cc[diff]

Reland of: Only store leading 13 bits of password hash.

Reland of: 862103002 at patchset 120001
Reverted here: https://codereview.chromium.org/875983008/

BUG=454553, 433180
R=jww@chromium.org, bcwhite@chromium.org, jwd@chromium.org, sky@chromium.org
TBR=mlerman@chromium.org

Review URL: https://codereview.chromium.org/900583003

Cr-Commit-Position: refs/heads/master@{#314559}
(cherry picked from commit 6fd469ad55039c45056bbe119b8dac8e4f0a8514)

Review URL: https://codereview.chromium.org/913813002

Cr-Commit-Position: refs/branch-heads/2272@{#254}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/browser/signin/chrome_signin_client.cc[diff]
• chrome/browser/signin/local_auth.cc[diff]
• chrome/browser/signin/local_auth.h[diff]
• chrome/browser/signin/local_auth_unittest.cc[diff]
• chrome/browser/signin/signin_manager_factory.cc[diff]
• chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm[diff]
• chrome/browser/ui/views/profiles/profile_chooser_view.cc[diff]
• chrome/browser/ui/webui/signin/inline_login_handler_impl.cc[diff]
• chrome/browser/ui/webui/signin/user_manager_screen_handler.cc[diff]
• tools/metrics/histograms/histograms.xml[diff]

Android: Fix GPU recovery issues

    a)
    The swap accounting is a bit unreliable when the GPU process
    crashes or the context is lost. We might end up thinking that
    too many swap acks are pending (which will never arrive) and
    bail out of CompositorImpl::Composite() early.
    Ignore the swap limit when deciding to composite if we know
    the context was lost. Then calling Composite() will cause the
    output surface to get recreated.

    b)
    Fix infinite retry loops of which there are two:
    One is that we could indefinitely early-out of Composite()
    and repost if the GPU process keeps crashing at startup before
    LTH ever gets a chance to try create a context.

    Fix regression with https://codereview.chromium.org/738983002/
    which both removed the LOG(FATAL) for too many successive retry
    attempts (used to happen inside LTH), and added a similar retry
    loop where we might never call SetOutputSurface and keep
    relaunching the GPU process.

    Also essentially revert https://codereview.chromium.org/750643003/
    to simplify things. We don't need to early-out in Composite()
    anymore if the GPU channel is lost. This is handled better in
    cc now and we can just attempt to Composite(). It will schedule
    OutputSurface creation. Even if we call Composite() again in the
    meantime, that should be harmless. And after we eventually call
    SetOutputSurface(), this will trigger ScheduleComposite().

BUG=453511,453671,453819,453649,448549
NOTRY=True

Review URL: https://codereview.chromium.org/903933005

Cr-Commit-Position: refs/heads/master@{#315390}
(cherry picked from commit bce21923514e1b1d92d5dd743785830fe9c10ad3)

Review URL: https://codereview.chromium.org/913713003

Cr-Commit-Position: refs/branch-heads/2272@{#253}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• content/browser/renderer_host/compositor_impl_android.cc[diff]
• content/browser/renderer_host/compositor_impl_android.h[diff]

Mac: Fix for janky tab dragging/reordering (merge to M41)

-[TabView drawRect:] was called repeatedly to unnecessarily update the glow
that is not changing or should not have changed.

1. Selected tabs don't have glow, so don't redraw on mouseMoved.

2. When dragging an unselected tab, the mouse point relative to the tab view
does not change, so no need to redraw the glow.

3. When a dragged unselected tab slides behind another tab, let the dragged tab
keep the glow instead of the tab in front of it (this is a behavior change).
I think this is the more correct behavior, and we never have to redraw tabs
while dragging.

BUG=452925
TBR=rsesek@chromium.org

Review URL: https://codereview.chromium.org/882193003

Cr-Commit-Position: refs/heads/master@{#313734}
(cherry picked from commit 2dad4dfbdd6fbc846f09766a263739ea6f3439ed)

Review URL: https://codereview.chromium.org/915713002

Cr-Commit-Position: refs/branch-heads/2272@{#252}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm[diff]
• chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.h[diff]
• chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.mm[diff]
• chrome/browser/ui/cocoa/tabs/tab_view.mm[diff]

[Ozone-Dri] Set DPMS to off when disabling a display

Need to turn it off to reduce the power used by the display when idling.

BUG=chrome-os-partner:35458
TEST=Wait for the displays to turn off and check with 'modetest -c' that the DPMS state is off

Review URL: https://codereview.chromium.org/877213005

Cr-Commit-Position: refs/heads/master@{#315111}
(cherry picked from commit 46c8606644c297cd5e7271805192d9df5dd698ce)

Review URL: https://codereview.chromium.org/911133002

Cr-Commit-Position: refs/branch-heads/2272@{#251}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• ui/ozone/platform/dri/native_display_delegate_dri.cc[diff]

Prevent single-app kiosk mode auto-launch if device is disabled

If a device is disabled, it should show the disabled screen and not
start any sessions. Regular sessions, auto-launch for public sessions
and auto-launch for consumer kiosk mode respected this. Auto-launch
for enterprise kiosk mode takes a different code path that had
slipped through the cracks. The effect was that single-app kiosk mode
would auto-launch even if a device was disabled.

BUG=454005
TEST=New browser test

TBR=antrim

Review URL: https://codereview.chromium.org/882043006

Cr-Commit-Position: refs/heads/master@{#314330}
(cherry picked from commit 0ec3b217448a4c76a77c43e558687df18a61c20e)

Review URL: https://codereview.chromium.org/908963003

Cr-Commit-Position: refs/branch-heads/2272@{#250}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/browser/chromeos/login/kiosk_browsertest.cc[diff]
• chrome/browser/chromeos/login/ui/login_display_host_impl.cc[diff]

Merge: Fix a crash during aborting of operations on provided file systems.

In case of an abort, a memory corruption was occuring because of a call to
Queue::Complete() after an operation is aborted, which is invalid according to
both documentation and a DCHECK.

This CL fixes the issue by avoiding calling Queue::Complete() for aborted
tasks.

TBR=hirono@chromium.org
TEST=Tested manually. Try to copy files from a ZIP archive with thousands of
     files, and abort during the operation.
BUG=454310

Review URL: https://codereview.chromium.org/882153006

Cr-Commit-Position: refs/heads/master@{#314722}
(cherry picked from commit 33176770fd2364913cb17f251315192b8bf593da)

Review URL: https://codereview.chromium.org/915523002

Cr-Commit-Position: refs/branch-heads/2272@{#249}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/browser/chromeos/file_system_provider/throttled_file_system.cc[diff]

Remove use of TextView.getMaxLines to restore ICS compatibility

ElidedTextView uses setMaxLines and getMaxLines to manage expanding and
collapsing the URL bar. getMaxLines was only introduced in API version
16; this CL removes its use and overrides setMaxLines to achieve the
same effect.

BUG=455144

Review URL: https://codereview.chromium.org/899453005

Cr-Commit-Position: refs/heads/master@{#315448}
(cherry picked from commit ebfd2b53b71a6fa9b52b9c1856d89a97a9c0597e)

Committed on behalf of tsergeant@chromium.org.

TBR=tedchoc@chromium.org, tsergeant@chromium.org

Review URL: https://codereview.chromium.org/910093005

Cr-Commit-Position: refs/branch-heads/2272@{#248}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java[diff]

Use floor instead of ceil for the size of the layer for wallpapers.

Otherwise, pixels on the edge of wallpaper may be blended with the pixel outside of the boundary.

BUG=368591
R=mukai@chromium.org

Review URL: https://codereview.chromium.org/871773004

Cr-Commit-Position: refs/heads/master@{#313003}
(cherry picked from commit 8fab1bba6ba22e5a917d8afcc835ec385f59cb2e)

Review URL: https://codereview.chromium.org/911663004

Cr-Commit-Position: refs/branch-heads/2272@{#247}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• ash/desktop_background/desktop_background_view.cc[diff]

Incrementing VERSION to 41.0.2272.52

Cr-Commit-Position: refs/branch-heads/2272@{#246}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/VERSION[diff]

Disable D3D11 on systems with AMD switchable graphics.

They may have problems when using hardware video decoding and D3D11 on the discrete gpu.

BUG=451420
TBR=zmo@chromium.org

Review URL: https://codereview.chromium.org/875403009

Cr-Commit-Position: refs/heads/master@{#315165}
(cherry picked from commit ae441cb44c78cc91ba0169e6b1fa30ebaf968c1f)

Review URL: https://codereview.chromium.org/871013011

Cr-Commit-Position: refs/branch-heads/2272@{#245}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• gpu/config/gpu_driver_bug_list_json.cc[diff]

Enumerate all display adapters to detect AMD switchable graphics.

Keying off of the driver manufacturer name doesn't work on some systems, so use SetupAPI to enumerate all installed display adapters to check if both an AMD and Intel display adapter are installed.

BUG=455046,451420
NOPRESUBMIT=true
TBR=zmo@chromium.org

Review URL: https://codereview.chromium.org/893993006

Cr-Commit-Position: refs/heads/master@{#314923}
(cherry picked from commit dd5bf63e4a1d177137a9c6c641bbc6c4782ef202)

Review URL: https://codereview.chromium.org/895133004

Cr-Commit-Position: refs/branch-heads/2272@{#244}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• gpu/config/gpu_info_collector_win.cc[diff]

Android: Fix potential null-ptr deref

BrowserGpuChannelHostFactory::GetGpuChannel() can
return NULL. In particular it already checks
IsLost() and returns NULL if that is the case.

BUG=445945

Review URL: https://codereview.chromium.org/867093004

Cr-Commit-Position: refs/heads/master@{#314683}
(cherry picked from commit 62e2fc7f7dd1d2f29c6299efa1535c8894d4cb4c)

Review URL: https://codereview.chromium.org/872253009

Cr-Commit-Position: refs/branch-heads/2272@{#243}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• content/browser/renderer_host/render_widget_host_view_android.cc[diff]

Fix DNS Prefetch in Chrome: new message type not added to filter.

R=thakis@chromium.org
BUG=455342
NOTRY=true

Review URL: https://codereview.chromium.org/874163005

Cr-Commit-Position: refs/heads/master@{#314972}
(cherry picked from commit 913b668663b854e3d88dcf42f5e055a94d824fb1)

Review URL: https://codereview.chromium.org/901673003

Cr-Commit-Position: refs/branch-heads/2272@{#242}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/browser/net/predictor_browsertest.cc[diff]
• chrome/browser/renderer_host/chrome_render_message_filter.cc[diff]
• chrome/test/data/predictor/dns_prefetch.html[Added - diff]

Incrementing VERSION to 41.0.2272.51

Cr-Commit-Position: refs/branch-heads/2272@{#241}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/VERSION[diff]

IndexedDB: Re-enable leveldb manifest reuse.

The new leveldb manifest reuse feature was disabled because the CrOS dev channel
daily error % by channel values increased after this landed in that channel (by
about 3x). Reverting this change did not return the dev channel rates back to
normal. Furthermore the beta channel (with this feature enabled) did not
experience an increase in errors.

Commit details: Returns manifest reuse back to the state introduced in
crrev.com/803603004 (de701ab) which was disabled in two subsequent reverts:
crrev.com/841753003 (ca6c875) and crrev.com/852073002 (617e94e).

BUG=402980

Review URL: https://codereview.chromium.org/899933002

(cherry picked from commit 6bd2fc1919a84eff0141634ccc49483669ab7e37)

Cr-Original-Commit-Position: refs/heads/master@{#314638}
Cr-Commit-Position: refs/branch-heads/2272@{#240}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• content/browser/indexed_db/leveldb/leveldb_database.cc[diff]

GetEffectiveDomain should handle ws scheme as same as http scheme.

CookieMonster::AnyEquivalentCookie asserts that there are no multiple
cookies that are identical to each other. That is achieved by inserting / deleting
cookies carefully, but it goes wrong with WebSocket schemes.

CookieMonster::DoCookieTaskForURL for given URL loads cookies when
cookies for key = cookie_util::GeteEffectiveDomain(scheme, host) is not
yet loaded. When the task ends, it stores loaded cookies and marks the key as
loaded. cookie_util::GetEffectiveDomain consults
egistry_controlled_domains::GetDomainAndRegistry
when http or https schemes are given, whereas it doesn't when ws or wss
schemes are given.
Imagine we are about to load stored cookies for ws://www.example.com/
and http://www.example.com/. As written above, they have different keys:
www.example.com and example.com. So each of them is loaded and it breaks
the assertion.

BUG=370021
TBR=ricea@chromium.org, rsleevi@chromium.org

Review URL: https://codereview.chromium.org/859663003

Cr-Commit-Position: refs/heads/master@{#313706}
(cherry picked from commit 5ca0f699ed11b59167acb32f3fa7c7480630bdcc)

Review URL: https://codereview.chromium.org/911553002

Cr-Commit-Position: refs/branch-heads/2272@{#239}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• net/cookies/cookie_monster_unittest.cc[diff]
• net/cookies/cookie_store_unittest.h[diff]
• net/cookies/cookie_util.cc[diff]
• net/cookies/cookie_util_unittest.cc[diff]

Incrementing VERSION to 41.0.2272.50

Cr-Commit-Position: refs/branch-heads/2272@{#238}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/VERSION[diff]

Incrementing VERSION to 41.0.2272.49

Cr-Commit-Position: refs/branch-heads/2272@{#237}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/VERSION[diff]

Only increment the history list offset if we are not replacing the current item.

BUG=453708
TEST=as in bug
TBR=creis@chromium.org

Review URL: https://codereview.chromium.org/902083002

Cr-Commit-Position: refs/heads/master@{#315060}
(cherry picked from commit 26b1681180785dfcedc55cf0574e43f21de8fb10)

(This cherry-pick omits the test as it does not merge cleanly.)

Review URL: https://codereview.chromium.org/895583008

Cr-Commit-Position: refs/branch-heads/2272@{#236}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• content/renderer/render_frame_impl.cc[diff]

Incrementing VERSION to 41.0.2272.48

Cr-Commit-Position: refs/branch-heads/2272@{#235}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/VERSION[diff]

Remove stray newline in tracing.zip filename

The uploaded trace is currently inaccessible because of the stray
newline.

BUG=455782
TEST=upload a feedback report with trace & download tracing.zip

Review URL: https://codereview.chromium.org/869853004

Cr-Commit-Position: refs/heads/master@{#314858}
(cherry picked from commit 14a9aedeebbbc06a23af0087796fb48b4103b3f6)

Review URL: https://codereview.chromium.org/909593002

Cr-Commit-Position: refs/branch-heads/2272@{#234}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• components/feedback/feedback_data.cc[diff]

Don't create a pairing registry on platforms that don't provide a delegate.

This was broken by https://codereview.chromium.org/834673007. Constructing
a PairingRegistry with a null delegate causes pairing to be offered, but if
selected, the host process will crash.

BUG=455501
TBR=jamiewalch@chromium.org

Review URL: https://codereview.chromium.org/903963002

Cr-Commit-Position: refs/heads/master@{#314969}
(cherry picked from commit dbec99efb805e22b77b5c2d18a2f21e405fbc5cf)

Review URL: https://codereview.chromium.org/889493004

Cr-Commit-Position: refs/branch-heads/2272@{#233}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• remoting/host/remoting_me2me_host.cc[diff]

[Android] Upstreamed Stars UMA from iOS.

There are some UMA strings, enum constants in iOS repository
that can be shared with Android, so moved to components.

BUG=452254

Review URL: https://codereview.chromium.org/891493003

Cr-Commit-Position: refs/heads/master@{#314707}
(cherry picked from commit f0a2c44b48f239ea4e6c4d0571be846a5fc524fa)

TBR=lpromero@chromium.org, sky@chromium.org

Review URL: https://codereview.chromium.org/899353003

Cr-Commit-Position: refs/branch-heads/2272@{#232}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/android/BUILD.gn[diff]
• chrome/chrome.gyp[diff]
• components/enhanced_bookmarks.gypi[diff]
• components/enhanced_bookmarks/BUILD.gn[diff]
• components/enhanced_bookmarks/enhanced_bookmark_utils.h[diff]

Incrementing VERSION to 41.0.2272.47

Cr-Commit-Position: refs/branch-heads/2272@{#231}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/VERSION[diff]

Fix compile failure in M41 Beta build due to https://codereview.chromium.org/899323002/

BUG=None
TEST=None
TBR=pkotwicz

Review URL: https://codereview.chromium.org/904773002

Cr-Commit-Position: refs/branch-heads/2272@{#230}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• athena/env/athena_env_impl.cc[diff]

[Ozone-DRI] Re-enable GBM surface mode support

GBM surface mode requires synchronous page flips at the moment. We need
to set DriWrapper to synchronously page flip.

BUG=none
NOTRY=true

Review URL: https://codereview.chromium.org/847213002

Cr-Commit-Position: refs/heads/master@{#311337}

gpu: media: RenderingHelper: wait for the display & window to be ready

With the display configuration now asynchronous, we can't immediately read the display size. We need to wait until the hardware is probed.

Also the VSyncProvider cannot trigger the given callback until the PlatformWindow is properly setup with the display. We need to wait for it the actually be resized.

BUG=447798
TEST=run video_decode_accelerator_unittest on freon

Review URL: https://codereview.chromium.org/835653005

Cr-Commit-Position: refs/heads/master@{#313473}

gpu: media: unittests: explicitly create a main loop

On Ozone/Freon initializing GL requires a main loop.

BUG=447798
TEST=run video_encode_accelerator_unittest on freon

Review URL: https://codereview.chromium.org/844533003

Cr-Commit-Position: refs/heads/master@{#312341}

Review URL: https://codereview.chromium.org/905613002

Cr-Commit-Position: refs/branch-heads/2272@{#229}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• content/common/gpu/media/rendering_helper.cc[diff]
• content/common/gpu/media/rendering_helper.h[diff]
• content/common/gpu/media/video_decode_accelerator_unittest.cc[diff]
• content/common/gpu/media/video_encode_accelerator_unittest.cc[diff]
• ui/ozone/platform/dri/dri_wrapper.cc[diff]
• ui/ozone/platform/dri/dri_wrapper.h[diff]
• ui/ozone/platform/dri/gbm_surface.cc[diff]
• ui/ozone/platform/dri/ozone_platform_gbm.cc[diff]
• ui/ozone/platform/dri/test/mock_dri_wrapper.cc[diff]
• ui/ozone/platform/dri/test/mock_dri_wrapper.h[diff]

Avoid crashing if multiple target popup is empty.

If the bitmap wasn't allocated, return false instead.

BUG=411505

Review URL: https://codereview.chromium.org/879143002

Cr-Commit-Position: refs/heads/master@{#314009}
(cherry picked from commit 0ed0918111d020972e00feda36ae0b68075d6d0f)
TBR=sievers@chromium.org

Review URL: https://codereview.chromium.org/869023009

Cr-Commit-Position: refs/branch-heads/2272@{#228}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• content/renderer/render_view_impl.cc[diff]

Don't report DRP request error code UMA when LOAD_BYPASS_PROXY is set.

This fixes a reporting bug with the
DataReductionProxy.RequestCompletionErrorCodes histograms. Previously,
these histograms counted requests that encountered errors when retrying
the request after bypassing the data reduction proxy (e.g. block-once).
This is incorrect because the error did not occur when trying to use the
DRP.

The fix is to ignore requests that completed with the LOAD_BYPASS_PROXY
load flag, since these requests did not use the DRP even if the
proxy_server() in the URLRequest is still set to the DRP.

BUG=454947

Review URL: https://codereview.chromium.org/896793004

Cr-Commit-Position: refs/heads/master@{#314432}
(cherry picked from commit fb93bf47152d82d4403f73fc74b4f560255d16ab)

Review URL: https://codereview.chromium.org/901143004

Cr-Commit-Position: refs/branch-heads/2272@{#227}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats.cc[diff]
• components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats_unittest.cc[diff]

[Merge 41] Make PointerDeviceObserver work under Ozone

This CL:
- Makes PointerDeviceObserver get notified when a mouse or touchpad is
  plugged in or removed by making PointerDeviceObserver an
  InputDeviceEventObserver on ozone only.
- Adds InputDeviceEventObserver::OnMouseDeviceConfigurationChanged() and
       InputDeviceEventObserver::OnTouchpadDeviceConfigurationChanged().
- Adds the plumbing from EventFactoryEvdev to notify
  InputDeviceEventObservers when a mouse or touchpad is plugged in or
  removed.

In a later CL I will make PointerDeviceObserver an InputDeviceEventObserver on
X11 and add the X11 plumbing

BUG=450899
TEST=Manual, see bug
R=spang@chromium.org
TBR=pkotwicz

Review URL: https://codereview.chromium.org/889403003

Cr-Commit-Position: refs/heads/master@{#314400}
(cherry picked from commit b726eb10541ccd17e678202bc7e502feb0854742)

Review URL: https://codereview.chromium.org/899323002

Cr-Commit-Position: refs/branch-heads/2272@{#226}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• ash/display/display_change_observer_chromeos.cc[diff]
• ash/display/display_change_observer_chromeos.h[diff]
• ash/virtual_keyboard_controller.cc[diff]
• ash/virtual_keyboard_controller.h[diff]
• chrome/browser/chromeos/system/pointer_device_observer.cc[diff]
• chrome/browser/chromeos/system/pointer_device_observer.h[diff]
• chrome/chrome_browser_chromeos.gypi[diff]
• ui/events/devices/device_data_manager.cc[diff]
• ui/events/devices/device_data_manager.h[diff]
• ui/events/devices/device_hotplug_event_observer.h[diff]
• ui/events/devices/input_device_event_observer.h[diff]
• ui/events/devices/x11/device_data_manager_x11_unittest.cc[diff]
• ui/events/ozone/evdev/event_converter_evdev.cc[diff]
• ui/events/ozone/evdev/event_converter_evdev.h[diff]
• ui/events/ozone/evdev/event_converter_evdev_impl.cc[diff]
• ui/events/ozone/evdev/event_converter_evdev_impl.h[diff]
• ui/events/ozone/evdev/event_device_info.cc[diff]
• ui/events/ozone/evdev/event_device_info.h[diff]
• ui/events/ozone/evdev/event_factory_evdev.cc[diff]
• ui/events/ozone/evdev/event_factory_evdev.h[diff]
• ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc[diff]
• ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.h[diff]
• ui/events/platform/x11/x11_hotplug_event_handler.cc[diff]

Merge M41: Process WM_ENDSESSION in the traybar icon window.

BUG=441960

Review URL: https://codereview.chromium.org/888693003

Cr-Commit-Position: refs/heads/master@{#313934}

Review URL: https://codereview.chromium.org/905563002

Cr-Commit-Position: refs/branch-heads/2272@{#225}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/browser/ui/views/status_icons/status_tray_win.cc[diff]
• tools/metrics/histograms/histograms.xml[diff]

Don't reconfigure displays when they are suspended

When a Chrome OS device enters suspend, Chrome suspends the displays and
then probes and reconfigures them on resume.  However, an increasing
number of Chrome OS devices make use of the dark resume state to perform
some processing without alerting the user that the Chrome OS device has
woken up.  Attempting to configure the displays in this state causes the
screen to flash on and off, which can alert the user that their Chrome
OS device is doing something and is generally a bad user experience.
Instead, don't configure the displays in dark resume.  They are going to
be probed and reconfigured after a full resume anyway so there should be
no harm in skipping the reconfiguration during a dark resume.

BUG=chrome-os-partner:35253

Review URL: https://codereview.chromium.org/871653002

Cr-Commit-Position: refs/heads/master@{#314494}
(cherry picked from commit 091b5725609144d990930736f6c009ba1a52ae9c)

R=derat@chromium.org, dnicoara@chromium.org
TBR=derat@chromium.org, dnicoara@chromium.org

Review URL: https://codereview.chromium.org/901723002

Cr-Commit-Position: refs/branch-heads/2272@{#224}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• ui/display/chromeos/display_configurator.cc[diff]
• ui/display/chromeos/display_configurator.h[diff]
• ui/display/chromeos/display_configurator_unittest.cc[diff]

cc: Fix multiple outstanding output surface requests

SingleThreadProxy was previously not considering
DidFailToInitializeOutputSurface responses as an outstanding
RequestNewOutputSurface call. This would cause the embedder to start
servicing an output surface request, then composite, receive another,
and then have double output surface requests.

The fix is to consider this failure state as a request.

TBR=danakj@chromium.org,jbauman@chromium.org,sievers@chromium.org
BUG=444277

Review URL: https://codereview.chromium.org/871743002

Cr-Commit-Position: refs/heads/master@{#313357}
(cherry picked from commit 5232fbbf8df7e06471950a12bc041c766e31a997)

Review URL: https://codereview.chromium.org/896423003

Cr-Commit-Position: refs/branch-heads/2272@{#223}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• cc/trees/layer_tree_host_unittest_context.cc[diff]
• cc/trees/single_thread_proxy.cc[diff]
• content/renderer/gpu/compositor_dependencies.h[diff]
• content/renderer/gpu/render_widget_compositor.cc[diff]
• content/renderer/gpu/render_widget_compositor.h[diff]
• content/renderer/gpu/render_widget_compositor_unittest.cc[diff]
• content/renderer/render_thread_impl.cc[diff]
• content/renderer/render_thread_impl.h[diff]
• content/test/fake_compositor_dependencies.cc[diff]
• content/test/fake_compositor_dependencies.h[diff]

Merge M41: [Ozone] Constrain the cursor when overscan insets are set

Constrain the mouse cursor to the painted region of the screen when overscan
insets are set.

BUG=427619
TEST=Manual, see bug
R=spang@chromium.org
TBR=pkotwicz

Review URL: https://codereview.chromium.org/873563002

Cr-Commit-Position: refs/heads/master@{#313336}
(cherry picked from commit f52514eaab866573a7022cea2da3b93f1c18924d)

Review URL: https://codereview.chromium.org/868983004

Cr-Commit-Position: refs/branch-heads/2272@{#222}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• ash/host/ash_window_tree_host_ozone.cc[diff]
• ui/aura/window_tree_host_ozone.cc[diff]
• ui/aura/window_tree_host_ozone.h[diff]
• ui/events/ozone/evdev/cursor_delegate_evdev.h[diff]
• ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc[diff]
• ui/events/ozone/evdev/input_injector_evdev_unittest.cc[diff]
• ui/events/ozone/evdev/tablet_event_converter_evdev.cc[diff]
• ui/events/ozone/evdev/tablet_event_converter_evdev_unittest.cc[diff]
• ui/ozone/platform/caca/caca_window.cc[diff]
• ui/ozone/platform/caca/caca_window.h[diff]
• ui/ozone/platform/dri/dri_cursor.cc[diff]
• ui/ozone/platform/dri/dri_cursor.h[diff]
• ui/ozone/platform/dri/dri_window.cc[diff]
• ui/ozone/platform/dri/dri_window.h[diff]
• ui/ozone/platform/dri/dri_window_manager.cc[diff]
• ui/ozone/platform/egltest/ozone_platform_egltest.cc[diff]
• ui/ozone/platform/test/test_window.cc[diff]
• ui/ozone/platform/test/test_window.h[diff]
• ui/platform_window/platform_window.h[diff]
• ui/platform_window/win/win_window.cc[diff]
• ui/platform_window/win/win_window.h[diff]
• ui/platform_window/x11/x11_window.cc[diff]
• ui/platform_window/x11/x11_window.h[diff]

win: Disable use of FMA3 versions of CRT functions on x64 in libpeerconnection.dll

This is a repetition of what was done to fix the same issue
for chrome.dll here: https://codereview.chromium.org/771183004/

Using the FMA3 path in the CRT math functions is suspected of causing
crashes when disabled at the OS level.

BUG=436603,446983
TBR=tommi,brucedawson

Review URL: https://codereview.chromium.org/813133007

Cr-Commit-Position: refs/heads/master@{#310986}
(cherry picked from commit bbc857dee3d9a87d5d5cc47c6f4fd5e908fffd5b)

Review URL: https://codereview.chromium.org/901893005

Cr-Commit-Position: refs/branch-heads/2272@{#221}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• third_party/libjingle/overrides/initialize_module.cc[diff]

Add NULL check before using remote_service in SyncFileSystemService

SyncFileSystemService::remote_service_ may be NULL in shutdown phase,
after SyncFileSystemService::Shutdown is called.

BUG=454279

Review URL: https://codereview.chromium.org/886343003

Cr-Commit-Position: refs/heads/master@{#314484}
(cherry picked from commit 8c2944d39fd07c0fdeea1545ab388073d514370f)

TBR=tzik@chromium.org

Review URL: https://codereview.chromium.org/901153003

Cr-Commit-Position: refs/branch-heads/2272@{#220}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/browser/sync_file_system/sync_file_system_service.cc[diff]

Make DataFileRendererCldDataProvider's LoadCldData method public.

There's no reason that it needs to be private, and if another class wants to
compose this with additional functionality, it makes sense for it to be public.

BUG=367239
TBR=toyoshim@chromium.org

Review URL: https://codereview.chromium.org/845263002

Cr-Commit-Position: refs/heads/master@{#311039}
(cherry picked from commit 3198df3341ca97b92da988f72725cca8ea8b8114)

Review URL: https://codereview.chromium.org/905433002

Cr-Commit-Position: refs/branch-heads/2272@{#219}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• components/translate/content/renderer/data_file_renderer_cld_data_provider.h[diff]

Fixing crash upon window manager creation

BUG=452608
TEST=existing unit tests
TBR=stevenjb@chromium.org

Review URL: https://codereview.chromium.org/890293002

Cr-Commit-Position: refs/heads/master@{#314276}
(cherry picked from commit 388e681bb3df5e658559615fc417473402c32242)

Review URL: https://codereview.chromium.org/897213002

Cr-Commit-Position: refs/branch-heads/2272@{#218}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc[diff]
• chrome/browser/notifications/message_center_notifications_unittest.cc[diff]
• chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc[diff]
• chrome/browser/ui/ash/multi_user/multi_user_window_manager.cc[diff]
• chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc[diff]
• chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h[diff]
• chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc[diff]

Hide the taskbar microphone indicator for hotwording.

BUG=453829

Review URL: https://codereview.chromium.org/884773003

Cr-Commit-Position: refs/heads/master@{#314129}
(cherry picked from commit 4ccd7477a19e224aea27cefe35ddaee28b9fab2a)

TBR=mgiuca@chromium.org,tommi@chromium.org

Review URL: https://codereview.chromium.org/896183005

Cr-Commit-Position: refs/branch-heads/2272@{#217}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/browser/media/media_stream_capture_indicator.cc[diff]

Incrementing VERSION to 41.0.2272.46

Cr-Commit-Position: refs/branch-heads/2272@{#216}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/VERSION[diff]

[Merge] Don't allow profile deletion in Metro mode.

Bad things happen if you delete the profile that started the Metro
process (at best, you crash), since relaunching Metro with a new user
is not supported. Hiding the button selectively depending on the
profile selected is a bit weird, so in Metro mode, hide it for all
profiles.

BUG=448352
TBR=noms@chromium.org
Review URL: https://codereview.chromium.org/863063002

Cr-Commit-Position: refs/heads/master@{#313449}
(cherry picked from commit 9a4fcc927bf745d6aab08440e22344b393246492)

Conflicts:
	chrome/browser/ui/webui/signin/user_manager_screen_handler.cc

Review URL: https://codereview.chromium.org/887203003

Cr-Commit-Position: refs/branch-heads/2272@{#215}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/browser/resources/options/browser_options.js[diff]
• chrome/browser/resources/options/browser_options_profile_list.js[diff]
• chrome/browser/ui/webui/options/browser_options_handler.cc[diff]
• chrome/browser/ui/webui/signin/user_manager_screen_handler.cc[diff]

[Merge] [Mac] Allow "Enter" to activate the buttons in the new avatar bubble.

Despite this not being the OSX way, users are complaining that Enter doesn't
activate the buttons in the menu, because it used to. I think the easiest
way is to wrap all buttons in a view that responds to Enter, and activates
the button accordingly.

BUG=454467
TBR=noms@chromium.org
TEST=Start Chrome with --enable-new-avatar-menu. Open the avatar bubble and
tab through items. Pressing enter should perform the button's action.

Review URL: https://codereview.chromium.org/890143005

Cr-Commit-Position: refs/heads/master@{#314265}
(cherry picked from commit 7286b9d038d6d9f95578ced6de7ebaa788970d1d)

Review URL: https://codereview.chromium.org/903493003

Cr-Commit-Position: refs/branch-heads/2272@{#214}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm[diff]

Incrementing VERSION to 41.0.2272.45

Cr-Commit-Position: refs/branch-heads/2272@{#213}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/VERSION[diff]

Incrementing VERSION to 41.0.2272.44

Cr-Commit-Position: refs/branch-heads/2272@{#212}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/VERSION[diff]

Merge for Android only:

Make GL bindings conditional

>> Review URL: https://codereview.chromium.org/871763002
>> Cr-Commit-Position: refs/heads/master@{#313663}

and

>> Fix incorrect binding spec for multisampled_render_to_texture APIs

>> Review URL: https://codereview.chromium.org/887113003

>> Cr-Commit-Position: refs/heads/master@{#314422}

This checks in a different version for GL and EGL binding
code, just for Android (generated from
ui/gl/generate_bindings_android.py).

For other platforms nothing changes and binding code is generated
in the output directory still.

BUG=438742
TBR=kbr@chromium.org

Review URL: https://codereview.chromium.org/898763005

Cr-Commit-Position: refs/branch-heads/2272@{#211}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• third_party/khronos/README.chromium[diff]
• third_party/khronos/noninclude/GL/glext.h[Added - diff]
• ui/gl/DEPS[diff]
• ui/gl/generate_bindings_android.py[Added - diff]
• ui/gl/gl.gyp[diff]
• ui/gl/gl_bindings.h[diff]
• ui/gl/gl_bindings_autogen_egl_android.cc[Added - diff]
• ui/gl/gl_bindings_autogen_egl_android.h[Added - diff]
• ui/gl/gl_bindings_autogen_gl_android.cc[Added - diff]
• ui/gl/gl_bindings_autogen_gl_android.h[Added - diff]
• ui/gl/gl_version_info.cc[diff]
• ui/gl/gl_version_info.h[diff]

Initialize Android CrashDumpManager earlier

The CrashDumpManagerAndroid instance must be initialized before any
child process is created. This change moves the initialization to
PreThreadsCreate, which at the very least should be before the
PROCESS_LAUNCHER thread (where the potentially evil child processes will
be created). #nocrashes

BUG=439322

Review URL: https://codereview.chromium.org/889083002

Cr-Commit-Position: refs/heads/master@{#314083}
(cherry picked from commit 0a0e4fddc32adad7c90f10dce2eb7c57ef652e89)

Review URL: https://codereview.chromium.org/895163004

Cr-Commit-Position: refs/branch-heads/2272@{#210}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/browser/chrome_browser_main_android.cc[diff]
• chrome/browser/chrome_browser_main_android.h[diff]
• components/crash/browser/crash_dump_manager_android.cc[diff]

Incrementing VERSION to 41.0.2272.43

Cr-Commit-Position: refs/branch-heads/2272@{#209}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/VERSION[diff]

Revert "Load web contents after tab is created."

This reverts commit ce034956d41aa45f3cab36cc908f79f8b5af481f.

BUG=432562
TBR=tedchoc@chromium.org,jbudorick@chromium.org,sky@chromium.org

Review URL: https://codereview.chromium.org/892203008

Cr-Commit-Position: refs/branch-heads/2272@{#208}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• build/android/findbugs_filter/findbugs_known_bugs.txt[diff]
• chrome/android/BUILD.gn[diff]
• chrome/android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java[diff]
• chrome/android/java/src/org/chromium/chrome/browser/document/PendingDocumentData.java[diff]
• chrome/browser/android/chrome_web_contents_delegate_android.cc[diff]
• chrome/browser/android/chrome_web_contents_delegate_android.h[diff]
• chrome/chrome.gyp[diff]
• chrome/chrome_browser.gypi[diff]
• content/browser/web_contents/web_contents_android.cc[diff]
• content/browser/web_contents/web_contents_android.h[diff]
• content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java[diff]
• content/public/android/java/src/org/chromium/content_public/browser/WebContents.java[diff]

Snow has a slow TPM and appears to be slow in general.

Some tests are failing on Snow because cryptohome doesn't unmount in time.
Attempting to increase this timeout to alleviate the issue.
We can revert this patch if it doesn't help.

BUG=449746
TEST=various telemetry-based autotests on Snow
NOTRY=True

Review URL: https://codereview.chromium.org/871923007

Cr-Commit-Position: refs/heads/master@{#313173}
(cherry picked from commit 26be503cdf869b92e7deb2166b8f48dcc51a84d4)

Review URL: https://codereview.chromium.org/896843002

Cr-Commit-Position: refs/branch-heads/2272@{#207}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py[diff]

Fixing token repetition bug (M41 merge)

BUG=451598

Re-uploading this CL under my @chromium identity:

https://codereview.chromium.org/888203002

TBR=rkc@chromium.org,pennymac@google.com

Review URL: https://codereview.chromium.org/875843003

Cr-Commit-Position: refs/heads/master@{#314059}
(cherry picked from commit e161db2544453dce6bb0a0859ab8cdf05c405a64)

Review URL: https://codereview.chromium.org/883443004

Cr-Commit-Position: refs/branch-heads/2272@{#206}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• components/copresence/mediums/audio/audio_manager_impl.cc[diff]

Skip direct map from apk check for all Samsung.

If the device manufacturer is Samsung, skip the check for mmap
exec support.  This avoids triggering a warning on some devices.

See also:
  https://codereview.chromium.org/869593002/
  https://codereview.chromium.org/858983002/
  https://codereview.chromium.org/857833002/

BUG=448084

Review URL: https://codereview.chromium.org/900553005

(cherry picked from commit b1969b94183f4f4b1e2e6ccbf8221061d2d3e687)

Cr-Original-Commit-Position: refs/heads/master@{#314362}
Cr-Commit-Position: refs/branch-heads/2272@{#205}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java[diff]

Skip direct map from apk check for pre-KitKat Samsung.

If the android build version pre-dates KitKat and the device
manufacturer is Samsung, skip the check for mmap exec support.
This avoids triggering a warning on these devices.
The version check is included because these devices do not show
the warning on later OS builds.

BUG=448084
TBR=rmcilroy@chromium.org

Review URL: https://codereview.chromium.org/869593002

(cherry picked from commit 78efcc0f7e59612ec717d26ffce92fa643347210)

Cr-Original-Commit-Position: refs/heads/master@{#314156}
Cr-Commit-Position: refs/branch-heads/2272@{#204}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java[diff]
• base/android/java/src/org/chromium/base/library_loader/Linker.java[diff]

Fix crash on BLU Life Play devices related to switch preferences.

ChromeSwitchPreference uses setWidgetLayoutResource() to show a Material
switch, but on BLU Life Play devices, this has no effect and the default
switch is shown instead. As a result ChromeSwitchPreference.onBindView()
couldn't find the Material switch and was crashing with a NPE. This
fixes the crash by adding a null check, though these devices will still
show a non-material switch.

BUG=451447
R=dtrainor@chromium.org

Review URL: https://codereview.chromium.org/894873004

Cr-Commit-Position: refs/heads/master@{#314250}
(cherry picked from commit 796a0bc0a3064f17357460187a02d7b216853e0d)

Review URL: https://codereview.chromium.org/891343012

Cr-Commit-Position: refs/branch-heads/2272@{#203}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromeSwitchPreference.java[diff]

Merge to M41: When an extension is unloaded, unregister all event listeners, not just the lazy ones.

This fixes a problem where event listeners could stick around for a
short time period after an extension is unloaded, causing problems
with the onInstalled event for a new version of an extension.

BUG=449654

Review URL: https://codereview.chromium.org/877233002

Cr-Commit-Position: refs/heads/master@{#313556}
(cherry picked from commit 1a3586c0467a2e2f3777c060616e787bc9535c19)

TBR=kalman@chromium.org

Review URL: https://codereview.chromium.org/898743002

Cr-Commit-Position: refs/branch-heads/2272@{#202}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• extensions/browser/event_listener_map.cc[diff]
• extensions/browser/event_listener_map.h[diff]
• extensions/browser/event_listener_map_unittest.cc[diff]
• extensions/browser/event_router.cc[diff]

Disable network state reporting.

Update the DeviceStatusCollector to no longer report network state. We will
re-enable this for M42 once we've added code to detect an auto-launched kiosk
session.

BUG=452968
TBR=bartfab

Review URL: https://codereview.chromium.org/885853002

Cr-Commit-Position: refs/heads/master@{#313717}
(cherry picked from commit 00fc37605e1020b8822835d5d1d9025aab76c7f9)

Review URL: https://codereview.chromium.org/893173002

Cr-Commit-Position: refs/branch-heads/2272@{#201}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/browser/chromeos/policy/device_status_collector.cc[diff]
• chrome/browser/chromeos/policy/device_status_collector.h[diff]
• chrome/browser/chromeos/policy/device_status_collector_browsertest.cc[diff]

Merge to M41: Add missing NULL checks to NativeViewAccessibilityWin.

IAccessible objects are reference-counted, so the COM object
may persist if the view is deleted. We should always check the
view (which will be nulled when the view is deleted).

BUG=436074

Review URL: https://codereview.chromium.org/872683005

Cr-Commit-Position: refs/heads/master@{#313792}
(cherry picked from commit 6b6714d20c8311b0b0badff0cd783eb6a4bff4bc)

Review URL: https://codereview.chromium.org/896583005

Cr-Commit-Position: refs/branch-heads/2272@{#200}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• ui/views/accessibility/native_view_accessibility_win.cc[diff]

Speculative fix for RWHVBrowerTests on Mac.

It seems that the cause of the flakes (see bug) is caused by transient
readback failures, which is a normal condition that client code must
tolerate.  The purpose of these tests is actually to confirm correct
cropping/scaling behavior; and NOT that every readback must succeed.
Therefore, the tests have been altered to retry the CopyFromXXX()
operations until a successful readback occurs.

Added logging of readback failure reasons to aid in future debugging.
This information will also help to easily determine whether the
implementation is broken, or a test bot is in a bad state, should the
tests fail in the future.

Clean-up: Removed the IsUpperLeftPixelCyan() check, in favor of just
looking at the readback result for a "blank" SkBitmap.

BUG=444237

Review URL: https://codereview.chromium.org/867463002

Cr-Commit-Position: refs/heads/master@{#312684}
(cherry picked from commit bddc0efbcd0379d6b87ac70af1c9a803073d2bff)

Review URL: https://codereview.chromium.org/894303002

Cr-Commit-Position: refs/branch-heads/2272@{#199}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• content/browser/renderer_host/render_widget_host_view_browsertest.cc[diff]

Merge: Allow SW registration only if it's secure AND it's HTTP or HTTPS

BUG=453982
TEST=tested manually
TEST=content_unittests:ServiceWorkerDispatcherHostTest.Register_FileSystem*

Review URL: https://codereview.chromium.org/889323002

Cr-Commit-Position: refs/heads/master@{#314143}
(cherry picked from commit 22394d843a6c36eb2e6d7bdf4fb8e7c4b7ae8d68)

Merge: Service Worker: Improve some exception messages (Chromium).

- Prefix the error messages to indicate the operation
that failed (particularly helps when the error occurs
in a promise chain)
- Add more details to the error messages.

Example improvements:

Before: "URL too long"
After: "Failed to register a ServiceWorker: The
provided scriptURL or scope is too long."

Before: "The scope must be under the directory of the
script URL."
After: "Failed to register a ServiceWorker:
The path of the provided scope ('http://localhost:9898/mysecretpath')
is not under the directory of the provided scriptURL
('http://localhost:9898/resources/empty-worker.js')."

ONLY FILES

content/common/service_worker/service_worker_types.cc
content/common/service_worker/service_worker_types.h

BUG=436928
Review URL: https://codereview.chromium.org/813673005

Cr-Commit-Position: refs/heads/master@{#311428}
(cherry picked from commit 737a4ba8e6a63814c49f6bb5597e238275a3a810)

Review URL: https://codereview.chromium.org/898673002

Cr-Commit-Position: refs/branch-heads/2272@{#198}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• content/browser/service_worker/service_worker_dispatcher_host.cc[diff]
• content/browser/service_worker/service_worker_dispatcher_host_unittest.cc[diff]
• content/common/service_worker/service_worker_types.cc[diff]
• content/common/service_worker/service_worker_types.h[diff]

64-bit token fixes (M41 merge)

BUG=453523
TBR=rkc@chromium.org,pennymac@google.com

Review URL: https://codereview.chromium.org/870053008

Cr-Commit-Position: refs/heads/master@{#314023}
(cherry picked from commit 7cf6cbe2f59986f6d87b775d2856cfd799b158fb)

Review URL: https://codereview.chromium.org/892353002

Cr-Commit-Position: refs/branch-heads/2272@{#197}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/browser/copresence/chrome_whispernet_client_browsertest.cc[diff]
• chrome/browser/resources/whispernet_proxy/js/wrapper.js[diff]
• components/copresence/handlers/audio/audio_directive_handler_impl.cc[diff]
• components/copresence/mediums/audio/audio_manager.h[diff]
• components/copresence/mediums/audio/audio_manager_impl.cc[diff]
• components/copresence/mediums/audio/audio_manager_impl.h[diff]

Cherry-pick part of https://codereview.chromium.org/831523005.

This part is needed for the cherry-pick of
https://code.google.com/p/chromium/issues/detail?id=432562 to work.

BUG=432562
R=dtrainor@chromium.org

Review URL: https://codereview.chromium.org/895833002

Cr-Commit-Position: refs/branch-heads/2272@{#196}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/android/java/src/org/chromium/chrome/browser/ContentViewUtil.java[diff]
• chrome/browser/android/content_view_util.cc[diff]

Incrementing VERSION to 41.0.2272.42

Cr-Commit-Position: refs/branch-heads/2272@{#195}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/VERSION[diff]

Load web contents after tab is created.

In document mode, we used to start loading the web contents of a newly
opened tab before the chrome tab object is ready. This would result in
chrome intercept delegate not being initialized in time to figure out
whether the loaded URL needs to be sent as an intent instead.

This changes the order of operations to create the chrome tab first with
the given web contents and only then initiate the load.

BUG=432562
TBR=tedchoc@chromium.org,jbudorick@chromium.org,sky@chromium.org

Review URL: https://codereview.chromium.org/883153002

Cr-Commit-Position: refs/heads/master@{#313966}
(cherry picked from commit 4c55f398def3214369aefa9f2f2e8f5940d3799d)

Review URL: https://codereview.chromium.org/896633003

Cr-Commit-Position: refs/branch-heads/2272@{#194}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• build/android/findbugs_filter/findbugs_known_bugs.txt[diff]
• chrome/android/BUILD.gn[diff]
• chrome/android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java[diff]
• chrome/android/java/src/org/chromium/chrome/browser/document/PendingDocumentData.java[diff]
• chrome/browser/android/chrome_web_contents_delegate_android.cc[diff]
• chrome/browser/android/chrome_web_contents_delegate_android.h[diff]
• chrome/chrome.gyp[diff]
• chrome/chrome_browser.gypi[diff]
• content/browser/web_contents/web_contents_android.cc[diff]
• content/browser/web_contents/web_contents_android.h[diff]
• content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java[diff]
• content/public/android/java/src/org/chromium/content_public/browser/WebContents.java[diff]

Android: Put GPU process in foreground

That makes browser, foreground renderer, and GPU
have a similar priority. Otherwise the GPU process
might drop behind other (even unrelated bg) processes
and get killed too easily.

BUG=448549,453671
TBR=ppi@chromium.org

Review URL: https://codereview.chromium.org/889013002

Cr-Commit-Position: refs/heads/master@{#314173}
(cherry picked from commit e77a53958cc41a1df157929f492a52c564d37b1e)

Review URL: https://codereview.chromium.org/887563005

Cr-Commit-Position: refs/branch-heads/2272@{#193}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java[diff]
• content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java[diff]

Re-merging into M41 branch 2272: Omnibox: BookmarksProvider: Make Multiple Prefix Matches Work

This code significantly simplies the logic for matching.

Indeed, the old logic was buggy because multiple prefix matches could
results in explosive growth of the list of matches (even if only one
bookmark matches).  Reviewer, I would avoid reading and trying to
understand what CombineMatches() and the code that calls it is currently
broken.  See the second test case I added.  Before this
change, that test never terminates (in the time I waited) and explodes
the machine's memory.  Luckily this was rare; there are few reports on
crbug.

It's possible this new code is slower or faster than before (when the
old code behaved correctly).  I plan to look at the
Omnibox.Providertime.Bookmarks numbers before and after this change.

TBR=
sky for owners stamp; review it if you feel like

BUG=450850,434604

Review URL: https://codereview.chromium.org/882823004

Cr-Commit-Position: refs/heads/master@{#313574}
(cherry picked from commit 02f304ba896632433d2e91b57c381cca90d4c7b9)

Review URL: https://codereview.chromium.org/878413004

Cr-Commit-Position: refs/branch-heads/2272@{#192}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• components/bookmarks/browser/bookmark_index.cc[diff]
• components/bookmarks/browser/bookmark_index.h[diff]
• components/bookmarks/browser/bookmark_index_unittest.cc[diff]

Revert "Merge to M41 branch 2272:  Allow SW registration only if it's secure AND it's HTTP or HTTPS"

This reverts commit 909dea0c7ac38f76acb43f9ea9172ddd747f70f5.

Revert "Omnibox: BookmarksProvider: Make Multiple Prefix Matches Work"

This reverts commit b6fb51542e0b5ef297a660f383e9c16ece379899.

BUG=

Review URL: https://codereview.chromium.org/898593003

Cr-Commit-Position: refs/branch-heads/2272@{#191}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• content/browser/service_worker/service_worker_dispatcher_host.cc[diff]
• content/browser/service_worker/service_worker_dispatcher_host_unittest.cc[diff]

Revert "Omnibox: BookmarksProvider: Make Multiple Prefix Matches Work"

This reverts commit b6fb51542e0b5ef297a660f383e9c16ece379899.

BUG=

Review URL: https://codereview.chromium.org/895553003

Cr-Commit-Position: refs/branch-heads/2272@{#190}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• components/bookmarks/browser/bookmark_index.cc[diff]
• components/bookmarks/browser/bookmark_index.h[diff]
• components/bookmarks/browser/bookmark_index_unittest.cc[diff]

ozone: evdev: Set modifier flags on touch events

This fixes a regression vs X11 where all touch events are missing
modifier flags.

BUG=450650
TEST=Open http://www.rbyers.net/eventTest.html on link, hold shift, and
     tap the touchscreen. Page shows "shift" on the click event line.

Review URL: https://codereview.chromium.org/887743002

Cr-Commit-Position: refs/heads/master@{#313788}
(cherry picked from commit ec64091f736c8ba04a65b518c802ffd0d7b35386)

Review URL: https://codereview.chromium.org/892313002

Cr-Commit-Position: refs/branch-heads/2272@{#189}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• ui/events/ozone/evdev/event_factory_evdev.cc[diff]
• ui/events/ozone/evdev/touch_event_converter_evdev.cc[diff]
• ui/events/ozone/evdev/touch_event_converter_evdev.h[diff]

[Android] Change enhanced bookmark folder structure.

- Top level folders are now all the sub folders of
  Bookmark Bar, Mobile, and Others nodes.
- We no longer use Uncategorized.

BUG=453024

Review URL: https://codereview.chromium.org/869193008

Cr-Commit-Position: refs/heads/master@{#314013}
(cherry picked from commit a01c664cd6802d64d212f68d1c9392a4340ca835)

TBR=newt@chromium.org

Review URL: https://codereview.chromium.org/894853002

Cr-Commit-Position: refs/branch-heads/2272@{#188}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/android/java/src/org/chromium/chrome/browser/BookmarksBridge.java[diff]
• chrome/android/javatests/src/org/chromium/chrome/browser/BookmarksBridgeTest.java[diff]
• chrome/browser/android/bookmarks/bookmarks_bridge.cc[diff]
• chrome/browser/android/bookmarks/bookmarks_bridge.h[diff]

Omnibox: BookmarksProvider: Make Multiple Prefix Matches Work

This code significantly simplies the logic for matching.

Indeed, the old logic was buggy because multiple prefix matches could
results in explosive growth of the list of matches (even if only one
bookmark matches).  Reviewer, I would avoid reading and trying to
understand what CombineMatches() and the code that calls it is currently
broken.  See the second test case I added.  Before this
change, that test never terminates (in the time I waited) and explodes
the machine's memory.  Luckily this was rare; there are few reports on
crbug.

It's possible this new code is slower or faster than before (when the
old code behaved correctly).  I plan to look at the
Omnibox.Providertime.Bookmarks numbers before and after this change.

TBR=sky,pkasting
(for owners stamp; review it if you feel like)

BUG=450850,434604

Review URL: https://codereview.chromium.org/882823004

Cr-Commit-Position: refs/heads/master@{#313574}
(cherry picked from commit 02f304ba896632433d2e91b57c381cca90d4c7b9)

Review URL: https://codereview.chromium.org/881653006

Cr-Commit-Position: refs/branch-heads/2272@{#187}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• components/bookmarks/browser/bookmark_index.cc[diff]
• components/bookmarks/browser/bookmark_index.h[diff]
• components/bookmarks/browser/bookmark_index_unittest.cc[diff]

Merge to M41 branch 2272:  Allow SW registration only if it's secure AND it's HTTP or HTTPS

BUG=453982
TEST=tested manually
TEST=content_unittests:ServiceWorkerDispatcherHostTest.Register_FileSystem*

Review URL: https://codereview.chromium.org/889323002

Cr-Commit-Position: refs/heads/master@{#314143}
(cherry picked from commit 22394d843a6c36eb2e6d7bdf4fb8e7c4b7ae8d68)

Review URL: https://codereview.chromium.org/896563002

Cr-Commit-Position: refs/branch-heads/2272@{#186}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• content/browser/service_worker/service_worker_dispatcher_host.cc[diff]
• content/browser/service_worker/service_worker_dispatcher_host_unittest.cc[diff]

Invalid press events don't create multiple pointers with the same id.

Previously if we got an invalid event stream such as

Press id 0
Press id 0

MotionEventAura would happily add the second pointer. Now we replace
the first pointer with the second pointer.

This work around is required due to crbug.com/373125.

BUG=450880

Review URL: https://codereview.chromium.org/873283003

Cr-Commit-Position: refs/heads/master@{#313116}
(cherry picked from commit b88d572b627a99714051bf057afdb2ead4f58489)

Review URL: https://codereview.chromium.org/867823005

Cr-Commit-Position: refs/branch-heads/2272@{#185}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• ui/aura/gestures/gesture_recognizer_unittest.cc[diff]
• ui/events/gestures/motion_event_aura.cc[diff]
• ui/events/gestures/motion_event_aura_unittest.cc[diff]

Correctly track texture cleared state for sharing

When sharing textures in mailboxes using MailboxManagerSync
there's an optimization that if textures are not updated then
there is no need to share it again. However the code that
checks whether textures are updated ignores the cleared
state, causing shared texture to remain uncleared
indefinitely.

Fix by check the cleared state. And add a unit test.

BUG=453199

Review URL: https://codereview.chromium.org/890453002

Cr-Commit-Position: refs/heads/master@{#313814}
(cherry picked from commit 2f4ff4807f5d7805a5658ceb7ba71072152ea6c9)
TBR=boliu@chromium.org

Review URL: https://codereview.chromium.org/896543002

Cr-Commit-Position: refs/branch-heads/2272@{#184}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• gpu/command_buffer/service/mailbox_manager_unittest.cc[diff]
• gpu/command_buffer/service/texture_definition.cc[diff]
• gpu/command_buffer/service/texture_definition.h[diff]

Fix uninitialized timestamps being passed to the gesture lib

The CL corrects a bug where clock_gettime was placed in
a DCHECK call and thus not executed on release builds.

Contributed by sheckylin@chromium.org

BUG=chrome-os-partner:35111
TEST=samus ChromeOS build

Review URL: https://codereview.chromium.org/884313002

Cr-Commit-Position: refs/heads/master@{#313634}
(cherry picked from commit c2467847c97406bc1566a6b65ba40b6284b305e9)

Review URL: https://codereview.chromium.org/895673003

Cr-Commit-Position: refs/branch-heads/2272@{#183}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• ui/events/ozone/evdev/libgestures_glue/gesture_timer_provider.cc[diff]

Merge of r313189 to M41.

Removes "ui-sans" from the ChromeOS system UI default font list.

The ChromeOS system UI (rendered through HarfBuzz) now
relies on gfx::RenderText::CreateSkiaTypeface(), and
skia actually returns exactly same typeface for
'Noto Sans UI' and 'ui-sans' in the current configuration.
ui-sans is simply redundant.

BUG=444894
TBR=jshin@chromium.org

Review URL: https://codereview.chromium.org/823003002

Cr-Commit-Position: refs/heads/master@{#313189}
(cherry picked from commit 550404a8be2b84c686ac855204c737233292fd41)

Review URL: https://codereview.chromium.org/890913004

Cr-Commit-Position: refs/branch-heads/2272@{#182}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• ui/strings/app_locale_settings.grd[diff]
• ui/strings/translations/app_locale_settings_ar.xtb[diff]
• ui/strings/translations/app_locale_settings_bn.xtb[diff]
• ui/strings/translations/app_locale_settings_hi.xtb[diff]
• ui/strings/translations/app_locale_settings_ja.xtb[diff]
• ui/strings/translations/app_locale_settings_kn.xtb[diff]
• ui/strings/translations/app_locale_settings_ko.xtb[diff]
• ui/strings/translations/app_locale_settings_ml.xtb[diff]
• ui/strings/translations/app_locale_settings_mr.xtb[diff]
• ui/strings/translations/app_locale_settings_ta.xtb[diff]
• ui/strings/translations/app_locale_settings_te.xtb[diff]
• ui/strings/translations/app_locale_settings_th.xtb[diff]
• ui/strings/translations/app_locale_settings_zh-CN.xtb[diff]
• ui/strings/translations/app_locale_settings_zh-TW.xtb[diff]

Revert "[Mac] Fixed bug with notification getting stucked on screen."

> The CL causes crashes.
>
> > This fixes a bug with notifications getting stucked on screen while
> > hovering with mouse old notifications popups and new arrived popups.
> > Source of the problem is popup animation getting stopped, rather when
> > finished.
> >
> > BUG=418053
> > R=jianli@chromium.org, thakis@chromium.org
> >
> > TEST=see http://crbug.com/418053 for reproduction details.
> >
> > Committed: https://crrev.com/39caad968f9b43d7b24d6c2d75596161a951de68
> > Cr-Commit-Position: refs/heads/master@{#298805}
>
> BUG=423001
>
> Review URL: https://codereview.chromium.org/856633002
>
> Cr-Commit-Position: refs/heads/master@{#312290}

BUG=423001
TBR=avi@chromium.org

Review URL: https://codereview.chromium.org/865133003

Cr-Commit-Position: refs/branch-heads/2272@{#181}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• ui/message_center/cocoa/popup_collection_unittest.mm[diff]
• ui/message_center/cocoa/popup_controller.mm[diff]

[Merge] [Win] Fix crash if the profile dir cannot be created

If the profile is NULL, the code will hit the CHECK on line 389 anyway.

BUG=414332
TBR=noms@chromium.org

Review URL: https://codereview.chromium.org/878143003

Cr-Commit-Position: refs/heads/master@{#313709}
(cherry picked from commit 82e87d588df3a7334cf542ce68c9614869745f70)

Review URL: https://codereview.chromium.org/897453002

Cr-Commit-Position: refs/branch-heads/2272@{#180}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/browser/chrome_browser_main.cc[diff]

Make SetDisplayPower() take a callback to signal completion

SetDisplayPower() is called by powerd to turn the panel on. After that
powerd will set the backlight level. Since DisplayConfigurator may be
executing the SetDisplayPower() operation asynchronously, the panel
may still be off when powerd tries to set the backlight level. So
powerd's operation would be ignored by the driver.

BUG=chrome-os-partner:35662

Review URL: https://codereview.chromium.org/886103002

Cr-Commit-Position: refs/heads/master@{#313983}
(cherry picked from commit eebe273b953b5c726473d2af63feb13dd0d5f090)

Review URL: https://codereview.chromium.org/892183003

Cr-Commit-Position: refs/branch-heads/2272@{#179}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc[diff]
• chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.h[diff]
• chromeos/dbus/services/display_power_service_provider.cc[diff]
• chromeos/dbus/services/display_power_service_provider.h[diff]
• ui/display/chromeos/display_configurator.cc[diff]
• ui/display/chromeos/display_configurator.h[diff]
• ui/display/chromeos/display_configurator_unittest.cc[diff]

[Merge] Fix "choose what to sync" in the webview signin

When "Choose what to sync" is clicked, we change the source to 3 in the
gaia continue url.

BUG=452440
TBR=noms@chromium.org

Review URL: https://codereview.chromium.org/892493002

(cherry picked from commit ef953dd4a7075adbda2cb5d6fdb366fc9bf4e2e5)

Review URL: https://codereview.chromium.org/899433002

Cr-Commit-Position: refs/branch-heads/2272@{#178}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• chrome/browser/resources/gaia_auth_host/authenticator.js[diff]

Allow universal access from file if flag is set and url is file scheme.

BUG=449075
TEST=content_unittests --gtest_filter=NavigationControllerTest.IsInPageNavigation

Review URL: https://codereview.chromium.org/855883002

Cr-Commit-Position: refs/heads/master@{#313051}
(cherry picked from commit 3d426436e10135a99f5e54fe1135767eb55712db)
TBR=creis@chromium.org

Review URL: https://codereview.chromium.org/895463003

Cr-Commit-Position: refs/branch-heads/2272@{#177}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}

• content/browser/frame_host/navigation_controller_impl.cc[diff]
• content/browser/frame_host/navigation_controller_impl_unittest.cc[diff]