Update mini_chromium to get close$NOCANCEL, and update GYP to keep up.

Update mini_chromium to 313bd83d6d9d, picking up:

313bd83d6d9d Use close$NOCANCEL on Mac, as in Chrome r23369.
15a69caf735f Add some things from base/synchronization:
             ConditionVariable and Lock.

Also, udpate GYP to 46282cedf40f (r1977), picking up:

r1977 android: Add a way to override build system variables.
r1976 android: Don't emit useless info into generated makefiles.
r1975 Fix indentation for emacs and add missing keyword.
r1974 Changes ninja generator to only output empty names if not already
      output
r1973 Changes the ninja generator to output phony targets for
      uninteresting targets
r1972 Makes matching of build files work when absolute
r1971 Support for custom NM/readelf binaries in your toolchain.
r1970 android: Support host multilib builds.
r1969 Makes analyzer output names of all executable target types
r1968 android: Make buildbot able to use a custom manifest.
r1967 ninja win: don't expect pdb to be generated when
      GenerateDebugInformation: false
r1966 Makes the analyzer output the set of targets needing a build
r1965 Removes old way to specify files to look for
r1964 Provide a way to suppress implicit MIDL generation rules for
      actions
r1963 Style changes for analyzer __ -> _ and lots of single newlines to
      double newlines.
r1962 Changes for analyzer
r1961 Pull in relevant targets when using xcode-ninja
r1960 Guard against configurations without 'xcode_settings'
r1959 Updates analyzer to output to a file

R=rsesek@chromium.org

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

DEPS

@@ -25,10 +25,10 @@ deps = {
       '237d7a871eea8c1ef5227795e81ff071f15c2710',  # svn r671
   'crashpad/third_party/gyp/gyp':
       Var('chromium_git') + '/external/gyp@' +
-      '39bb8956231c997babf0f25befdfb531f4d0b43c',  # svn r1958
+      '46282cedf40ff7fe803be4af357b9d59050f02e4',  # svn r1977
   'crashpad/third_party/mini_chromium/mini_chromium':
       Var('chromium_git') + '/chromium/mini_chromium@' +
-      'abd6e3792f4f54d58c86b01438a69ae61f4f2f34',
+      '313bd83d6d9dc276bd48743fddc0295fc08f9478',
 }
 
 hooks = [