Update chromium to branch 1599.

Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

3 files changed, 4 insertions, 7 deletions

diff --git a/chromium/url/url_canon_icu.h b/chromium/url/url_canon_icu.h
index 11597685876..9bfd643eb21 100644
--- a/chromium/url/url_canon_icu.h
+++ b/chromium/url/url_canon_icu.h
@@ -7,7 +7,6 @@
 
 // ICU integration functions.
 
-#include "base/compiler_specific.h"
 #include "url/url_canon.h"
 #include "url/url_export.h"
 
@@ -28,7 +27,7 @@ class URL_EXPORT ICUCharsetConverter : public CharsetConverter {
 
   virtual void ConvertFromUTF16(const base::char16* input,
                                 int input_len,
-                                CanonOutput* output) OVERRIDE;
+                                CanonOutput* output);
 
  private:
   // The ICU converter, not owned by this class.
diff --git a/chromium/url/url_canon_relative.cc b/chromium/url/url_canon_relative.cc
index 30956a633f7..84317f80094 100644
--- a/chromium/url/url_canon_relative.cc
+++ b/chromium/url/url_canon_relative.cc
@@ -372,9 +372,8 @@ bool DoResolveRelativeHost(const char* base_url,
   // Parse the relative URL, just like we would for anything following a
   // scheme.
   url_parse::Parsed relative_parsed;  // Everything but the scheme is valid.
-  url_parse::ParseAfterScheme(&relative_url[relative_component.begin],
-                              relative_component.len, relative_component.begin,
-                              &relative_parsed);
+  url_parse::ParseAfterScheme(relative_url, relative_component.end(),
+                              relative_component.begin, &relative_parsed);
 
   // Now we can just use the replacement function to replace all the necessary
   // parts of the old URL with the new one.
diff --git a/chromium/url/url_canon_stdstring.h b/chromium/url/url_canon_stdstring.h
index 9b4a6c2a3b5..7450f156ac7 100644
--- a/chromium/url/url_canon_stdstring.h
+++ b/chromium/url/url_canon_stdstring.h
@@ -11,7 +11,6 @@
 
 #include <string>
 
-#include "base/compiler_specific.h"
 #include "url/url_canon.h"
 
 namespace url_canon {
@@ -52,7 +51,7 @@ class StdStringCanonOutput : public CanonOutput {
     buffer_len_ = cur_len_;
   }
 
-  virtual void Resize(int sz) OVERRIDE {
+  virtual void Resize(int sz) {
     str_->resize(sz);
     buffer_ = str_->empty() ? NULL : &(*str_)[0];
     buffer_len_ = sz;