1. 03 Feb, 2015 40 commits
    • rkc's avatar
      Remove the Copresence Endpoints API. · 2d743cb6
      rkc authored
      Since there are no plans to use this API at least for 1H 2015, there is no
      point leaving this code in Chrome. Removing this API to reduce code bloat.
      We can revisit adding this API again when this work gets prioritized.
      
      R=isherman@chromium.org, kalman@chromium.org, xiyuan@chromium.org
      BUG=452562
      
      This flag is specified since we're deleting an enum from histgrams. This currently breaks the presubmit.
      NOPRESUBMIT=true
      
      Review URL: https://codereview.chromium.org/895783002
      
      Cr-Commit-Position: refs/heads/master@{#314412}
      2d743cb6
    • cpu's avatar
      Add basic support for CAPS exe · 51747bc6
      cpu authored
      1- A singleton
      2- A logger
      
      Now CAPS depends on base and on chrome/common_version. About 190KB
      on plain release build.
      
      BUG=447073
      
      Review URL: https://codereview.chromium.org/890213002
      
      Cr-Commit-Position: refs/heads/master@{#314411}
      51747bc6
    • Nico Weber's avatar
      win/swarming: Make 64-bit debug component builds work on swarming? · 8d81593b
      Nico Weber authored
      After https://codereview.chromium.org/896583002/, the isolate step on the
      64-bit bot is failing with
      
          MappingError: Input file C:\b\build\slave\CrWinClang64_dbg_\build\src\out\Debug_x64\x64\msvcp120d.dll doesn't exist
      
      It looks like the x64\msvcp120d.dll only exists in 32-bit builds.
      While here, also add the x64 libraries for 32-bit release builds.
      
      BUG=453657,452057
      R=maruel@chromium.org, scottmg@chromium.org
      
      Review URL: https://codereview.chromium.org/897713002
      
      Cr-Commit-Position: refs/heads/master@{#314410}
      8d81593b
    • msarda's avatar
      Avoid double registration with content settings in account reconcilor. · 4555495a
      msarda authored
      This CL avoids a double registration for content settings in account
      rconcilor as this leads to a DCHECK being fired during a reauthentication
      operation.
      
      BUG=454507
      
      Review URL: https://codereview.chromium.org/896723006
      
      Cr-Commit-Position: refs/heads/master@{#314409}
      4555495a
    • garykac's avatar
      [Chromoting] Add ability to enable/disable GDrive support per-app in gyp. · 12564e89
      garykac authored
      Since not all AppRemoting apps will want or need GDrive support to be
      enabled, we need to be able to control which apps enable this feature.
      
      This cl adds 'app_features' to the AppRemoting gyp targets and passes
      the list of features into the build_webapp script (so the manifest can
      have the correct oauth scopes) and the webapp.
      
      Also, because the 'cast' capability was "in the way" for these changes,
      it has been converted into a feature as well (default: disabled).
      
      BUG=
      
      Review URL: https://codereview.chromium.org/895523004
      
      Cr-Commit-Position: refs/heads/master@{#314408}
      12564e89
    • estade's avatar
      Add sync experiment flag for wallet datatype. · 4e911e45
      estade authored
      If either the sync experiment OR the command line flag is present, the feature is enabled. (Enabling the feature also gives the user the ability to control it via a separate pref.)
      
      BUG=
      
      Review URL: https://codereview.chromium.org/875243003
      
      Cr-Commit-Position: refs/heads/master@{#314407}
      4e911e45
    • v8-autoroll's avatar
      Update V8 to version 4.2.49 (based on 7cb12037d30b255090b0ff0f01d7221cacc86c1a). · a8e467e2
      v8-autoroll authored
      TBR=machenbach@chromium.org
      
      Review URL: https://codereview.chromium.org/885113005
      
      Cr-Commit-Position: refs/heads/master@{#314406}
      a8e467e2
    • kelvinp's avatar
      Improve HRD first run experience · e24343ec
      kelvinp authored
      Summary of changes:
      1. Implements a rich UI to prompt for the user's permission to
         accept remote assistance from a hangout participant
      2. Move getUrlParameter() to base.js
      3. Show an interactive auth prompt if the user doesn't have an
         OAuth2 token for starting the It2Me host in v2 app. For v1
         app, do an auth redirect.
      4. Tear down the It2MeHelpee channel if the user decline the
         remote assistance.
      
      BUG=451591
      
      Review URL: https://codereview.chromium.org/888323002
      
      Cr-Commit-Position: refs/heads/master@{#314405}
      e24343ec
    • agl's avatar
      Roll BoringSSL. · cfabe642
      agl authored
      2683af7 Fix typo and ASN.1 tag number range comment in bytestring.h.
      a84f06f Move free from cbb_init() to only CBB_init().
      d660b57 runner: Refactor handshake fragmenting slightly.
      79ae85e Remove NETSCAPE_HANG_BUG.
      e33b9b0 Remove dtls1_timeout_st.
      83f9040 Add DTLS timeout and retransmit tests.
      d9b091b Revert "Drop retransmits in DTLS tests."
      377fc31 Document DTLS timeout API and add current_time_cb hook.
      868c7ef Don't assume alignment of ChaCha key on ARM.
      64b17cc Fix patch collision of d062c8af and 2b2d66d4.
      23343e4 Fix AES-256 NIDs.
      d062c8a Probe for NEON support if getauxval is missing.
      2b2d66d Remove string.h from base.h.
      efed221 Enable more warnings & treat warnings as errors on Windows.
      0bb81fc Fix misleading comment.
      ab21891 Add a script to generate the ChaCha ARM asm.
      
      BUG=454308
      
      Review URL: https://codereview.chromium.org/871373017
      
      Cr-Commit-Position: refs/heads/master@{#314404}
      cfabe642
    • benjhayden's avatar
      Add Renderer.LineLayoutMs to histograms.xml · 311fd12c
      benjhayden authored
      https://codereview.chromium.org/877293003
      
      Review URL: https://codereview.chromium.org/884243008
      
      Cr-Commit-Position: refs/heads/master@{#314403}
      311fd12c
    • skia-deps-roller's avatar
      Roll src/third_party/skia 46c77f7:c9fed24 · 76f2f877
      skia-deps-roller authored
      Summary of changes available at:
      https://chromium.googlesource.com/skia/+log/46c77f7..c9fed24
      
      CQ_EXTRA_TRYBOTS=tryserver.blink:linux_blink_rel,linux_blink_dbg
      TBR=stephana@google.com
      
      Review URL: https://codereview.chromium.org/895953002
      
      Cr-Commit-Position: refs/heads/master@{#314402}
      76f2f877
    • rch's avatar
      Factor several helper methods out of · 5ac594b1
      rch authored
      UpdateCacheFromPrefsOnPrefThread and UpdatePrefsOnPrefThread.
      Factor out key strings into variables.
      
      Review URL: https://codereview.chromium.org/890093002
      
      Cr-Commit-Position: refs/heads/master@{#314401}
      5ac594b1
    • pkotwicz's avatar
      Make PointerDeviceObserver work under Ozone · b726eb10
      pkotwicz authored
      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
      
      Review URL: https://codereview.chromium.org/889403003
      
      Cr-Commit-Position: refs/heads/master@{#314400}
      b726eb10
    • asanka's avatar
      [net] Clang-format filename_util_unittest.cc · 13cc94a3
      asanka authored
      Upcoming changes to filename_util are unreviewable if they include
      material code changes and formatting changes. This CL just includes
      formatting changes and is the result of running:
      
        'clang-format -i --style=Chromium filename_util_unittest.cc'.
      
      Depends on: https://codereview.chromium.org/869823003
      Needed by : https://codereview.chromium.org/869233006
      
      BUG=444102
      
      Review URL: https://codereview.chromium.org/873843002
      
      Cr-Commit-Position: refs/heads/master@{#314399}
      13cc94a3
    • vmpstr's avatar
      cc: Record frame timing composite events in the tracker. · 99aa853c
      vmpstr authored
      This patch adds composite event recording for requested rects into the
      frame timing tracker.
      
      The current approach is to record all rects that intersect the visible
      rect for that layer.
      
      R=danakj, mpb@chromium.org
      BUG=441555
      
      Review URL: https://codereview.chromium.org/884243004
      
      Cr-Commit-Position: refs/heads/master@{#314398}
      99aa853c
    • asanka's avatar
      [net] Subtract timestamps to determine if uploading file changed. · b77c8ffa
      asanka authored
      UploadFileElementReader relies on checking the modified time of files
      being uploaded to determine if a sliced file was modified during upload.
      Clients of the net stack (in particular Blink) currently pass around the
      expected modified time in a manner which cause the timestamp to lose
      precision (E.g. converting to and from a double time_t).
      
      As a result the expected timestamp and the current timestamp as returned
      by GetFileInfo() will not match exactly. Current code attempted to
      compensate for this by converting both timestamps to (integer) time_t.
      However, since the conversion rounds down, this check would only succeed
      if the loss of precision of the expected timestamp also caused it to
      round down. This is not always the case. (E.g. (epoch + 10.999999) will
      become 10 when converted to time_t, but the expected timestamp may have
      rounded up to (epoch + 11.0) in the meantime.)
      
      This patch compares the timestamps by checking if the magnitude of the
      difference is less than one second.
      
      BUG=426465
      R=mmenke
      
      Review URL: https://codereview.chromium.org/868253012
      
      Cr-Commit-Position: refs/heads/master@{#314397}
      b77c8ffa
    • primiano's avatar
      [memory-inspector] Add prebuilts for Android x86/x86_64 · 95f711c1
      primiano authored
      This change also:
       - adds x86/x86_64 in the list of supported ABIs.
       - adjusts the regexp of the REST endpoints to support the emulator:
         the old regex was using \w+ to match the device serial, which
         doesn't work with the cases such as "emulator-1234".
      
      TBR=primiano@chromium.org
      BUG=
      
      Review URL: https://codereview.chromium.org/887583004
      
      Cr-Commit-Position: refs/heads/master@{#314396}
      95f711c1
    • rockot's avatar
      Docserver: Add commit history and _reset_commit servlet · 34477f12
      rockot authored
      This adds commit history to named commits in the CommitTracker. The history can be viewed by requesting /_query_commit/<commit-name>.
      
      This also adds a _reset_commit servlet which will reset the current commit ID of a named commit. This servlet will only obey the request if the given commit ID is present in the named commit's history.
      
      BUG=None
      R=kalman@chromium.org
      NOTRY=true
      
      Review URL: https://codereview.chromium.org/736773002
      
      Cr-Commit-Position: refs/heads/master@{#314395}
      34477f12
    • dfalcantara's avatar
      Break out manifest icon logic from ShortcutHelper · 44329fdc
      dfalcantara authored
      * Parcels out logic from the ShortcutHelper that deals with
        Manifest icons and puts it into the ManifestIconSelector.
      
      * Renames the ShortcutHelperTest to ManifestIconSelectorTest
        since that class entirely tested Manifest icon support,
        anyway.
      
      BUG=453170
      
      Review URL: https://codereview.chromium.org/880203004
      
      Cr-Commit-Position: refs/heads/master@{#314394}
      44329fdc
    • estade's avatar
      Add CVC icon to card unmasking prompt · 5457d13c
      estade authored
      (placeholder images inserted, bug 454009 filed)
      
      Also, move CardUnmaskPrompt.java to proper location.
      
      BUG=454009
      
      Review URL: https://codereview.chromium.org/887153003
      
      Cr-Commit-Position: refs/heads/master@{#314393}
      5457d13c
    • miu's avatar
      Move 'super-long post delayed task' warning to IncomingTaskQueue. · 5d4e9ddd
      miu authored
      This is a follow-up based on TBR review comments made to this change:
      https://codereview.chromium.org/873393004
      
      This moves the warning message to a more-central location so that posting
      delayed tasks from additional call points (eg., MessageLoopProxy) will be
      checked.
      
      BUG=450045
      
      Review URL: https://codereview.chromium.org/878033005
      
      Cr-Commit-Position: refs/heads/master@{#314392}
      5d4e9ddd
    • meacer's avatar
      Captive Portal Interstitial: Use SSID even if connection type isn't Wi-Fi. · 67f91dc7
      meacer authored
      |IsWiFiConnection| isn't accurate on some platforms. Whenever SSID is available,
      use it and ignore |IsWiFiConnection|. This CL also adds a delegate to
      |CaptivePortalBlockingPage| for better testing.
      
      BUG=451272
      
      Review URL: https://codereview.chromium.org/894153003
      
      Cr-Commit-Position: refs/heads/master@{#314391}
      67f91dc7
    • rtoy's avatar
      Update UMA mapping. · 10ab4e95
      rtoy authored
      UseCounter added for setting AudioBufferSourceNode.buffer more than
      once.
      
      BUG=448960
      
      Review URL: https://codereview.chromium.org/885183002
      
      Cr-Commit-Position: refs/heads/master@{#314390}
      10ab4e95
    • brucedawson's avatar
      Rewriting patch logic without the comma operator. · 944c28c5
      brucedawson authored
      When running /analyze on all of Chrome there were three warnings about
      using the comma operator in a tested expression. One was a genuine bug
      and the other two were in UncompressAndPatchChromeArchive. Rewriting
      to use nested if statements resolves these warnings (getting the count
      to zero) and makes the code clearer.
      
      Resolving the warning is not crucial, but it makes it easier to make a
      zero-tolerance policy for that warning and thus avoid future bugs.
      Plus, it makes the setup code easier to read.
      
      The warnings are:
      
      src\chrome\installer\setup\setup_main.cc(174) : warning C6319: Use of the comma-operator in a tested expression causes the left argument to be ignored when it has no side-effects.
      src\chrome\installer\setup\setup_main.cc(176) : warning C6319: Use of the comma-operator in a tested expression causes the left argument to be ignored when it has no side-effects.
      
      The bug that was found through this warning, which could eventually
      have been very serious, was fixed here:
      https://codereview.chromium.org/678193003
      
      BUG=427616
      
      Review URL: https://codereview.chromium.org/893703004
      
      Cr-Commit-Position: refs/heads/master@{#314389}
      944c28c5
    • ananta's avatar
      The ReadFile API on Windows invoked by the FileStream::Context class which is... · 959eaea4
      ananta authored
      The ReadFile API on Windows invoked by the FileStream::Context class which is used by URLRequestFileJob at times completes synchronously.
      
      The FileStream::Context class is used by the URLRequestFileJob class on the IO thread. The intention here is to open
      the file for overlapped IO and thus complete the read and writes asynchonously.
      Turns out that there are cases where the ReadFile API completes synchronously which ends up blocking the IO thread.
      http://support.microsoft.com/kb/156932
      
      Fix for this is to post the ReadFile call to a worker pool and inform the caller about failures etc on the calling thread.
      
      Changes in this patch are as below:-
      1. The FileStream::Context::Read function posts the ReadFile call to the Worker thread pool. The entry point for this task is the static
         function ReadAsync.
         This function posts results back to the originating thread via the function ReadAsyncResult
      
      2. Fixed the FileStreamTest.WriteRead test to not read the data in the completion callback of the stream
         Write function. This causes a DCHECK to fire in the MessageLoopForIO class that we are entering a nested
         loop which is a no no for that message pump type.
      
         This DCHECK fires because of the change on Windows to execute the ReadFile in a Worker thread pool.
         In any case this change is safe for all platforms.
         The written data is validated by reading it back in the function ValidateWrittenData in the TestWriteReadCompletionCallback class.
      
         We call this explicitly in the FileStreamTest.WriteRead test.
      
      3. Fix the SyncableFileOperationRunnerTest.CopyAndMove test failures.
      
      This test internally initiates a ReadFile call on Windows via the FileStream::Context class for the Copy and Move
      test. It invokes Copy and Move and then calls MessageLoop::RunUntilIdle. This call basically runs the message loop
      until all pending tasks and events have been processed. This works on Windows by fluke because the ReadFile call
      which completes asynchronously posts IO completion tasks to the IO thread (current thread) which then get pulled out
      by the RunUntilIdle call.
      
      There could be cases where the ReadFile call does not post IO completion events before RunUntilIdle returns and we could
      see the same failures.
      
      Reason we see this with this patch is because ReadFile is now completed by a worker pool thread which basically guarantees
      the above scenario. Fix is to use base::RunLoop::Run() and Quit the loop when the DidFinish callback is received.
      
      I changed all places in the syncable_file_operation_runner_unittest.cc file to use base::RunLoop::Run() or
      base::RunLoop::RunUntilIdle() as the MessageLoop equivalents are deprecated.
      
      BUG=423948
      
      Review URL: https://codereview.chromium.org/887863002
      
      Cr-Commit-Position: refs/heads/master@{#314388}
      959eaea4
    • achaulk's avatar
      cc: Change the restrictions on overlays for video · ae133cc3
      achaulk authored
      - Allow positively scaled transformations. Overlay hardware can handle this
      - Allow the STREAM_VIDEO_QUAD type. Tests added for that type
      
      TEST=manual test, video in overlay
      
      Review URL: https://codereview.chromium.org/855403002
      
      Cr-Commit-Position: refs/heads/master@{#314387}
      ae133cc3
    • mukai's avatar
      Fixes tray_session_length_limit_unittest timeout on valgrind. · 75be556f
      mukai authored
      According to test runs on my machine, the test looks like suspended
      after the test body finished, which seems to be waiting for
      remaining timer tests. ClearSessionLengthLimit() should be called
      at the end.
      
      This also has cosmetic changes like NULL -> nullptr
      
      BUG=454601
      R=stevenjb@chromium.org
      TEST=build with build_for_tool=memcheck, run ash_unittests with
        valgrind, and confirmed the test finishes in realistic time
      
      Review URL: https://codereview.chromium.org/895863002
      
      Cr-Commit-Position: refs/heads/master@{#314386}
      75be556f
    • sdefresne's avatar
      Remove obsolete code · f29a4397
      sdefresne authored
      ChromeHistoryClient is no longer a HistoryServiceObserver, so remove
      the cleanup code that dealt with that.
      
      Fix error path when HistoryService::Init() fails in TestingProfile by:
      - not calling SetTestingFactoryAndUse() with a null testing factory
      - returning false when HistoryService::Init() fails.
      
      BUG=373326
      
      Review URL: https://codereview.chromium.org/894783002
      
      Cr-Commit-Position: refs/heads/master@{#314385}
      f29a4397
    • jbudorick's avatar
      [Android] Add LogcatMonitor. · 7103545f
      jbudorick authored
      LogcatMonitor provides the same functionality as
      AndroidCommands.WaitForLogMatch and the associated functions.
      
      BUG=267773
      
      Review URL: https://codereview.chromium.org/896503002
      
      Cr-Commit-Position: refs/heads/master@{#314384}
      7103545f
    • rob's avatar
      Mark create/update/clear callbacks of notification API and create ID as optional · ff49cf31
      rob authored
      Also improved error reporting: if an error occurs, and
      chrome.runtime.lastError is not checked, then an error is printed to the
      console (to be consistent with error reporting in the other async APIs).
      
      The documentation has been updated to mention that these parameters
      were required before Chrome 42, these lines should be removed once
      Chrome 42 hits stable (https://crbug.com/452990).
      
      BUG=163750
      TEST=./out/Debug/interactive_ui_tests --gtest_filter=NotificationsApiTest.TestBasicUsage
      TEST=Manually, called chrome.tabs.create/update/clear without callback
           and observed that the notification is created as expected, and that
           an error is printed to the console when an error occurs (e.g.
           invalid iconUrl).
      R=kalman@chromium.org
      
      Review URL: https://codereview.chromium.org/855813002
      
      Cr-Commit-Position: refs/heads/master@{#314383}
      ff49cf31
    • dmazzoni's avatar
      Don't set the STATE_SYSTEM_HOTTRACKED state in tests. · dea5ba68
      dmazzoni authored
      It's set whenever the mouse is over an element, which just leads
      to flakiness.
      
      BUG=454600
      NOPRESUBMIT=true
      
      Review URL: https://codereview.chromium.org/896653002
      
      Cr-Commit-Position: refs/heads/master@{#314382}
      dea5ba68
    • sbc's avatar
      gyp_chromium: Better parsing of -G command line flag. · 10ef1e2a
      sbc authored
      Handle -G output_dir=foo as well as -Goutput_dir=foo.
      I'm not sure how common this case is but we have
      NaCl SDK bot that do this.
      
      Getting this wrong results in windows toolchain being
      installed in 'out/' (which doesn't necessarily exist)
      rather than the output_dir tree and gyp uses.
      
      Add unittests for the affected parts of gyp_chromium.
      
      BUG=454594
      
      Review URL: https://codereview.chromium.org/896663002
      
      Cr-Commit-Position: refs/heads/master@{#314381}
      10ef1e2a
    • jam's avatar
      Roll PDFium to bring in the following changes: · 90e6cbfe
      jam authored
      615082d  Remove OpenJPEG header generator binary from PDFium build.
      f3823b2  Add embedder test for fix to bug_452455.
      
      Review URL: https://codereview.chromium.org/899593003
      
      Cr-Commit-Position: refs/heads/master@{#314380}
      90e6cbfe
    • wtc's avatar
      Relanding of Add build targets for Opus tests. (patchset #2 id:20001 of · 626f929d
      wtc authored
      https://codereview.chromium.org/894473002/)
      
      test_opus_api, test_opus_encode, test_opus_decode, and test_opus_padding
      can be run directly, with no command-line options, and they print out
      "OK" during the test and an overall status message such as
      "All API tests passed." or "Tests completed successfully." at the end.
      
      The celt component has several unit tests. I didn't add build targets
      for them because some of them don't print any output, so you'd need a
      test harness script to examine their exit status.
      
      R=henrika@chromium.org,sergeyu@chromium.org
      BUG=452984
      
      Review URL: https://codereview.chromium.org/891353005
      
      Cr-Commit-Position: refs/heads/master@{#314379}
      626f929d
    • dtseng's avatar
      Reland Ensure WebView notifies desktop automation on creation, destruction, and change · 4a61275d
      dtseng authored
      Original issue https://codereview.chromium.org/880063002
      
      TBR=dtseng@chromium.org
      
      Review URL: https://codereview.chromium.org/895623003
      
      Cr-Commit-Position: refs/heads/master@{#314378}
      4a61275d
    • jiayl's avatar
      Fix a null ptr deref crash in DesktopCaptureDevice · ca020c9c
      jiayl authored
      BUG=450382
      
      Review URL: https://codereview.chromium.org/882153005
      
      Cr-Commit-Position: refs/heads/master@{#314377}
      ca020c9c
    • achaulk's avatar
      vaapi plumbing to allow hardware video overlays · 79812c1a
      achaulk authored
      Uses ozone GLImage instead of GLImageLinuxDMABuffer and binds it in the
      TextureManager, this lets it be scheduled as an overlay
      
      BUG=370522
      TEST=loaded on device (with 812913003, 806413004, 855403002, 810343004), play h264 video, verify that overlays are used and no artifacts are produced)
      
      Review URL: https://codereview.chromium.org/858653002
      
      Cr-Commit-Position: refs/heads/master@{#314376}
      79812c1a
    • Adam Langley's avatar
      Revert of "Revert of "Move the call to CRYPTO_set_NEON_capable up."" · 8e47fd58
      Adam Langley authored
      This reverts commit 02f7bf13 and
      thus effectively relands fa906382. That
      commit was suspected of breaking the EME tests but reverting it didn't
      unbreak anything.
      
      https://codereview.chromium.org/899463002/
      
      Cr-Commit-Position: refs/heads/master@{#314375}
      8e47fd58
    • skia-deps-roller's avatar
      Roll src/third_party/skia 4c93a12:46c77f7 · f1a8ec76
      skia-deps-roller authored
      Summary of changes available at:
      https://chromium.googlesource.com/skia/+log/4c93a12..46c77f7
      
      CQ_EXTRA_TRYBOTS=tryserver.blink:linux_blink_rel,linux_blink_dbg
      TBR=stephana@google.com
      
      Review URL: https://codereview.chromium.org/900573003
      
      Cr-Commit-Position: refs/heads/master@{#314374}
      f1a8ec76
    • thestig's avatar
      Make MockExtensionSystemFactory available in all ExtensionsTests. · 34f7ecae
      thestig authored
      BUG=454554
      
      Review URL: https://codereview.chromium.org/899553002
      
      Cr-Commit-Position: refs/heads/master@{#314373}
      34f7ecae