Account for server vs host clock skew in cookie expiration times.
When setting a cookie's expiration time in the cookie store we need
to take into account any difference between the HTTP server and the
host machine's real time clock.  This reverts 159685 which reverted 146616.

BUG=135131
TEST=net_unittests --gtest_filter=CookieMonster/CookieStoreTest/0.TestCookieDeletion

Review URL: https://chromiumcodereview.appspot.com/11339032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165323 0039d316-1c4b-4281-b951-d872f2087c98
alternate ntp: fix bookmark bar in ntp page

in ntp page, bookmark bar was broken after SearchViewController was removed.
this cl:
- lays it out at bottom of content view in the y-direction
- stacks it on top of all views so that it's floating atop content view in the
  z-order.

BUG=158773
TEST=verify per bug rpt


Review URL: https://chromiumcodereview.appspot.com/11361014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165324 0039d316-1c4b-4281-b951-d872f2087c98
Add tests for LocalFileSyncService::ApplyRemoteChange

BUG=156599
TEST=LocalFileSyncServiceTest.*
TBR=ben@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165325 0039d316-1c4b-4281-b951-d872f2087c98
[Sync] Unrevert fix for bug 154940

Original codereview at http://codereview.chromium.org/11342022/

BUG=158391
TBR=tim@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11347054

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165326 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 165326
Fixed and re-enabled unit tests for WebContentsVideoCaptureDevice.

1. Added mechanism to synchronize unit test tear-down with objects being destroyed on other threads.
2. Added locking around StubRenderWidgetHost::color_ in test code.
3. Re-enabled tests and removed relevant suppressions.

BUG=158317
TEST=Ran TSAN and Heapcheck with no errors.  Ran debug Chromium build with --vmodule=web_contents_video_capture_device=2 and confirmed no breakage in functionality.


Review URL: https://chromiumcodereview.appspot.com/11336027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165327 0039d316-1c4b-4281-b951-d872f2087c98
drive: Runtime null check for callback in OnUpdatedFileUploaded is unnecessary.

The only caller (OnGetFileSizeCompleteForUpdateFile) is already taking
a mandatory non-null callback.

BUG=126634

Review URL: https://chromiumcodereview.appspot.com/11365029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165328 0039d316-1c4b-4281-b951-d872f2087c98
[content shell] link against the TestRunner library

BUG=111316
TEST=layout tests are more awesome


Review URL: https://chromiumcodereview.appspot.com/11245004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165329 0039d316-1c4b-4281-b951-d872f2087c98
More changes for TSan v2 support:
 -- add the ignores file
 -- set the appropriate definitions for compiling dynamic annotations
 -- add suppressions for existing data races

BUG=23244,62694,102327,120808,158718
Review URL: https://codereview.chromium.org/11227052

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165330 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 165329
Fix the issue of cursor's device scale factor when primary monitor is swapped.

This CL makes cursor's device scale factor be set in RootWindow::MoveCursor.
Thus cursor's device scale factor is updated properly even when cursor moves
to another root window without cursor warp (e.g. when swapping primary display). 

BUG=157940
TEST=Manually check cursor's device scale factor is updated properly when swapping primary display for a display with a different device scale factor.

Review URL: https://chromiumcodereview.appspot.com/11307019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165331 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 165331
It should be CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_RENDERER_H_ instead of CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_CAPTURER_H_

TBR=xians@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165332 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 165332
Revert 165326 - [Sync] Unrevert fix for bug 154940

Original codereview at http://codereview.chromium.org/11342022/

BUG=158391
TBR=tim@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11347054

TBR=zea@chromium.org
Review URL: https://codereview.chromium.org/11364024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165333 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 165333
Disable OmniboxViewTest.Escape on ChromeOS

BUG=158913
TBR=pkasting@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165334 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 165334
Desktop aura: Fix tab dragging

- Tabs are now draggable into a window.
- You can no longer drag with the right mouse button.
- We now create an invisible window over the screen while dragging a
  tab. Previously, if you moved your mouse cursor quickly, you could
  end up with your cursor outside the window you were dragging and
  this broke tab dragging.

BUG=125106

Review URL: https://chromiumcodereview.appspot.com/11364013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165335 0039d316-1c4b-4281-b951-d872f2087c98
Re-enable Reload Page for unpacked platform apps.

Removal of TabContents from ShellWindow broke the reload page command for platform apps, which is popular with developers.

BUG=157756


Review URL: https://chromiumcodereview.appspot.com/11361003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165336 0039d316-1c4b-4281-b951-d872f2087c98