BASELINE: Update Chromium to 64.0.3282.139

Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

3 files changed, 20 insertions, 21 deletions

diff --git a/chromium/styleguide/c++/c++.md b/chromium/styleguide/c++/c++.md
index 423e0fc4084..344704da232 100644
--- a/chromium/styleguide/c++/c++.md
+++ b/chromium/styleguide/c++/c++.md
@@ -162,7 +162,7 @@ Place platform-specific #includes in their own section below the "normal"
 
   #if defined(OS_WIN)
   #include <windows.h>
-  #include "base/win/scoped_comptr.h"
+  #include "base/win/com_init_util.h"
   #elif defined(OS_POSIX)
   #include "base/posix/global_descriptors.h"
   #endif
diff --git a/chromium/styleguide/c++/c++11.html b/chromium/styleguide/c++/c++11.html
index 26e2e50afce..f169012d511 100644
--- a/chromium/styleguide/c++/c++11.html
+++ b/chromium/styleguide/c++/c++11.html
@@ -278,6 +278,14 @@ enum <i>enumname</i> : <i>base-type</i></code></td>
 </tr>
 
 <tr>
+<td>Raw String Literals</td>
+<td><code>string <i>var</i>=R&quot;(<i>raw_string</i>)&quot;;</code></td>
+<td>Allows a string to be encoded without any escape sequences, easing parsing in regex expressions, for example</td>
+<td><a href="http://en.cppreference.com/w/cpp/language/string_literal">string literal</a></td>
+<td>Beware of passing these as macro arguments, which can trigger a <a href="https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57824">lexer bug</a> on older GCC versions. <a href="https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/2kWQHbbuMHI">Discussion thread</a></td>
+</tr>
+
+<tr>
 <td>Rvalue References</td>
 <td><code>T(T&amp;&amp; t)</code> and <code>T&amp; operator=(T&amp;&amp; t)<br/><br/>
 template &lt;typename T&gt;<br/>void Function(T&amp;&amp; t) { ... }</code></td>
@@ -538,14 +546,6 @@ template &lt;typename T&gt;<br/>void Function(T&amp;&amp; t) { ... }</code></td>
 </tr>
 
 <tr>
-<td>Raw String Literals</td>
-<td><code>string <i>var</i>=R&quot;(<i>raw_string</i>)&quot;;</code></td>
-<td>Allows a string to be encoded without any escape sequences, easing parsing in regex expressions, for example</td>
-<td><a href="http://en.cppreference.com/w/cpp/language/string_literal">string literal</a></td>
-<td>Beware of passing these as macro arguments, which can trigger a <a href="https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57824">lexer bug</a> on older GCC versions. <a href="https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/2kWQHbbuMHI">Discussion thread</a></td>
-</tr>
-
-<tr>
 <td>String Direct Reference Functions</td>
 <td><code>std::string::front()</code>, <code>std::string::back()</code></td>
 <td>Returns a reference to the front or back of a string</td>
@@ -609,6 +609,14 @@ template &lt;typename T&gt;<br/>void Function(T&amp;&amp; t) { ... }</code></td>
 </tr>
 
 <tr>
+<td>Heterogeneous lookup in associative containers</td>
+<td><code><i>// Does not construct an std::string to use as the lookup key.</i><br>std::map&lt;std::string, int, std::less&lt;&gt;&gt; map;<br>auto it = map.find("answer");</code></td>
+<td>Allows searching associative containers without converting the key to exactly match the stored key type, assuming a suitable comparator exists.</td>
+<td><a href="http://en.cppreference.com/w/cpp/utility/functional/less">std::less</a></td>
+<td><a href="https://groups.google.com/a/chromium.org/d/msg/cxx/ow7hmdDm4yw/EDEvBRi_BQAJ">Discussion thread</a></td>
+</tr>
+
+<tr>
 <td><code>std::integer_sequence</code></td>
 <td><code>template &lt;size_t... I&gt;<br>void CallFooImpl(std::index_sequence&lt;I...&gt;) {<br>&nbsp;&nbsp;Foo(I...);<br>}<br><br>template &lt;size_t N&gt;<br>void CallFoo() {<br>&nbsp;&nbsp;CallFooImpl(std::make_index_sequence&lt;N&gt;());<br>}</code></td>
 <td>Template metaprogramming utility for representing a sequence of integers as a type.</td>
@@ -1193,14 +1201,6 @@ than binary literals.</td>
 </tr>
 
 <tr>
-<td>Heterogeneous lookup in associative containers</td>
-<td><code><i>// Does not construct an std::string to use as the lookup key.</i><br>std::map&lt;std::string, int, std::less&lt;&gt;&gt; map;<br>auto it = map.find("answer");</code></td>
-<td>Allows searching associative containers without converting the key to exactly match the stored key type, assuming a suitable comparator exists.</td>
-<td><a href="http://en.cppreference.com/w/cpp/utility/functional/less">std::less</a></td>
-<td></td>
-</tr>
-
-<tr>
 <td><code>std::complex</code> literals</td>
 <td><code>using namespace std::complex_literals;<br>std::complex&lt;double&gt; c = 2.0 + 0.5i;</code></td>
 <td>Allows <code>std::complex</code> objects to be more easily constructed.</td>
diff --git a/chromium/styleguide/objective-c/objective-c.md b/chromium/styleguide/objective-c/objective-c.md
index e37bb76ef05..fc6ddebe99a 100644
--- a/chromium/styleguide/objective-c/objective-c.md
+++ b/chromium/styleguide/objective-c/objective-c.md
@@ -3,7 +3,7 @@
 _For other languages, please see the [Chromium style guides](https://chromium.googlesource.com/chromium/src/+/master/styleguide/styleguide.md)._
 
 Chromium follows the
-[Google Objective-C style guide](https://google.github.io/styleguide/objcguide.xml)
+[Google Objective-C style guide](https://github.com/google/styleguide/blob/gh-pages/objcguide.md)
 unless an exception is listed below.
 
 A checkout should give you
@@ -19,9 +19,8 @@ Objective-C and Objective-C++ code also has an 80 character line length.
 
 ## Chromium C++ style
 
-Just as [Google Objective-C style](https://google.github.io/styleguide/objcguide.xml)
-follows [Google C++ Style](https://google.github.io/styleguide/cppguide.html),
-Chromium Objective-C and Objective-C++ follows [Chromium C++ style](../c++/c++.md).
+Where appropriate, the [Chromium C++ style](../c++/c++.md) style guide applies
+to Chromium Objective-C and (especially) Objective-C++
 
 ## Code Formatting