Chrome-Proxy will now have three directives relevant to versioning: "b=" -- the build number "p=" -- the patch number "c=" -- the client type (current values are "ios", "android", and "webview")

Currently, b and p only make sense for chrome types and are only being implemented for ios and android.

BUG=409934

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

Cr-Commit-Position: refs/heads/master@{#293591}
(cherry picked from commit 12a31fdc4f1d7abebb7845628dcd86a79d01e9b2)

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

Cr-Commit-Position: refs/branch-heads/2125@{#370}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Set the shelf icon title explicitly for settings and task manager

This allows us to set the icon title (used for hovertext) independently
of the window title (which is empty for Settings windows).

BUG=406954
TBR=sky@chromium.org

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

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

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

Cr-Commit-Position: refs/branch-heads/2125@{#371}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
metrics: reduce perf periodic collection interval to 3 hours from 24

This should increase the quantity of perf profiles collected for
chromiumos-wide-profiling by a factor of 8. Based on the current amount of
data received, this should increase the number of profiles collected to a
quantity less than it was before the collection scheduling was changed in
https://codereview.chromium.org/282093011/

TEST=Not really... This is just turning a knob. I did compile it.
BUG=chromium:413951

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

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

TBR=dhsharp@google.com,isherman@chromium.org

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

Cr-Commit-Position: refs/branch-heads/2125@{#372}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Adding media.MicrophoneVolume UMA stat.

BUG=405449,411380
TBR=tommi

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

Cr-Commit-Position: refs/heads/master@{#293919}
(cherry picked from commit 758955325212b2f561f09ca481967fb8c497e1ec)

Conflicts:
	media/audio/audio_input_controller.cc

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

Cr-Commit-Position: refs/branch-heads/2125@{#373}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Cherry-pick into M38: [aw] Fix crash when "misbehave" app exits fullscreen.

exitFullScreen() might be call without a prior call to
enterFullScreen() if a "misbehave" app overrides onShowCustomView
but does not add the custom view to the window. This fixes a
crash by returning early from exitFullScreen in that case.

BUG=408133

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

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

R=benm@chromium.org

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

Cr-Commit-Position: refs/branch-heads/2125@{#374}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Do not allow values to be migrated without MACs if the destination already has a MAC.

BUG=414554
TEST=Added regression test PrefHashBrowserTestUntrustedAdditionToPrefs which fails without this CL and passes with it.

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

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

TBR=gab@chromium.org

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

Cr-Commit-Position: refs/branch-heads/2125@{#375}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
[gcc 4.8] Explicitly initialize net_error in ProxyRetryInfo to fix build failure

gcc 4.8 reports build failure as net_error is not explicitly initialized. The error
thrown is as below -

net/proxy/proxy_retry_info.h: In member function
‘virtual void net::{anonymous}::ProxyListTest_DeprioritizeBadProxies_Test::TestBody()’:
net/proxy/proxy_retry_info.h:15:8: error: ‘proxy_retry_info.net::ProxyRetryInfo::net_error’
is used uninitialized in this function [-Werror=uninitialized]

R=kundaji@chromium.org, rsleevi@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#290239}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290239 0039d316-1c4b-4281-b951-d872f2087c98
(cherry picked from commit fc687ad3b2a0181afd01a226dce9d295c04495a1)

BUG=

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

Cr-Commit-Position: refs/branch-heads/2125@{#376}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Cleanup comments, unit tests and unnecessary early out.

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

Cr-Commit-Position: refs/heads/master@{#294206}
(cherry picked from commit 947fb1c405943173d09e721efcde628dee896e36)

BUG=414572

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

Cr-Commit-Position: refs/branch-heads/2125@{#377}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Incrementing VERSION to 38.0.2125.67

Cr-Commit-Position: refs/branch-heads/2125@{#378}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Integration test for data reduction proxy version header

This test verifies that the build and patch directives in the
Chrome-Proxy header are used as expected by the data reduction
proxy.

BUG=409936

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

Cr-Commit-Position: refs/heads/master@{#295074}
(cherry picked from commit 57fa3c717e29259bb8137667b4daca55a92414c8)

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

Cr-Commit-Position: refs/branch-heads/2125@{#379}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Incrementing VERSION to 38.0.2125.68

Cr-Commit-Position: refs/branch-heads/2125@{#380}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Removing LOG(WARNING) from DataReductionProxyUsageStats that made it in https://codereview.chromium.org/510353004/

BUG=409934

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

Cr-Commit-Position: refs/heads/master@{#293661}
(cherry picked from commit 99d51dff5dbfc203414e1dc1ab08f255994edc77)

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

Cr-Commit-Position: refs/branch-heads/2125@{#381}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
[Merge to M38] Fix themes on retina Mac

Make BrowserThemePack stop assuming that the maximum persistent ID is related to
the the size of kPersistingImages. https://codereview.chromium.org/453213002
broke this assumption on Mac. This assumption has been broken on Windows for a
long time

BUG=405105
TEST=None
TBR=pkotwicz

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

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

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

Cr-Commit-Position: refs/branch-heads/2125@{#382}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Don't use msmpeg2vdec.dll version 6.1.7140

This version of the dll seems to be causing a disproportionate number of
crashes, so we fall back to software decoding if that is the version of
the DLL on the user's machine.

BUG=403440

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

Cr-Commit-Position: refs/heads/master@{#292040}
(cherry picked from commit 61b78e43a64f95913e16f13a9a171881902d30d3)

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

Cr-Commit-Position: refs/branch-heads/2125@{#383}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Disable XI2 events on mirror window

BUG=406064
TBR=oshima@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#294477}
(cherry picked from commit 8417c8e514f88b0f431ed8c4d7e64f27faaffdab)

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

Cr-Commit-Position: refs/branch-heads/2125@{#384}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Fix test for master device.

BUG=406014
TBR=sadrul@chromium.org,derat@chromium.org

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

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

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

Cr-Commit-Position: refs/branch-heads/2125@{#385}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Incrementing VERSION to 38.0.2125.69

Cr-Commit-Position: refs/branch-heads/2125@{#386}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Merge "easy-unlock: Make policy fully override field trial."

> This allows dogfooders to get Easy unlock on consumer devices
> (i.e. non-enrolled devices).
>
> BUG=395154
>
> Review URL: https://codereview.chromium.org/546163005
>
> Cr-Commit-Position: refs/heads/master@{#294872}
> (cherry picked from commit 09098f7713f7cc8ea1faff9b6976301975675511)

TBR=xiyuan@chromium.org

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

Cr-Commit-Position: refs/branch-heads/2125@{#387}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Ensure app install is aborted when the install dialog is closed

If the user initiates an app install via the app launcher, it is
possible to close the install dialog by clicking on the background.
The app launcher window and modal dialog are destroyed without
cancelling the dialog, therefore keeping the install active.

This patch ensures that ExtensionInstallPrompt::Delegate::
InstallUIAbort() is called in this scenario to allow the delegate
(WebstoreStandaloneInstaller) to abort the install.

BUG=409616
TEST=browser_tests

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

Merged on behalf of tmdiep@chromium.org.

TBR=tmdiep@chromium.org

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

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

Cr-Commit-Position: refs/branch-heads/2125@{#388}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Merge "easy-unlock: Only show 'Set up' UI for en-US."

> BUG=414467
>
> Review URL: https://codereview.chromium.org/567643003
>
> Cr-Commit-Position: refs/heads/master@{#295156}
> (cherry picked from commit 78d93d0e19bbb635c4bfe6cb7dab0db26d04598c)

TBR=xiyuan@chromium.org

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

Cr-Commit-Position: refs/branch-heads/2125@{#389}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}