diff --git a/brightray/browser/inspectable_web_contents_impl.cc b/brightray/browser/inspectable_web_contents_impl.cc index 7f694ad54ff..840712c86a2 100644 --- a/brightray/browser/inspectable_web_contents_impl.cc +++ b/brightray/browser/inspectable_web_contents_impl.cc @@ -13,7 +13,7 @@ #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/devtools_client_host.h" #include "content/public/browser/devtools_http_handler.h" diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc index e6d73a608f3..47eb355aec7 100644 --- a/brightray/browser/url_request_context_getter.cc +++ b/brightray/browser/url_request_context_getter.cc @@ -30,8 +30,8 @@ namespace brightray { URLRequestContextGetter::URLRequestContextGetter( const base::FilePath& base_path, - MessageLoop* io_loop, - MessageLoop* file_loop, + base::MessageLoop* io_loop, + base::MessageLoop* file_loop, scoped_ptr network_delegate, content::ProtocolHandlerMap* protocol_handlers) : base_path_(base_path), diff --git a/brightray/common/application_info_win.cc b/brightray/common/application_info_win.cc index 8363970ebd8..49c53796358 100644 --- a/brightray/common/application_info_win.cc +++ b/brightray/common/application_info_win.cc @@ -2,7 +2,7 @@ #include "base/file_version_info.h" #include "base/memory/scoped_ptr.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace brightray { diff --git a/brightray/common/content_client.cc b/brightray/common/content_client.cc index 87cc07abfee..fc294f45ec5 100644 --- a/brightray/common/content_client.cc +++ b/brightray/common/content_client.cc @@ -9,7 +9,7 @@ #include "base/stringprintf.h" #include "base/string_util.h" #include "ui/base/resource/resource_bundle.h" -#include "webkit/user_agent/user_agent_util.h" +#include "webkit/common/user_agent/user_agent_util.h" namespace brightray { diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent index 5ffcb396d64..ccec3a4031f 160000 --- a/brightray/vendor/libchromiumcontent +++ b/brightray/vendor/libchromiumcontent @@ -1 +1 @@ -Subproject commit 5ffcb396d64df97a2d0220101e1e52598a661fc8 +Subproject commit ccec3a4031fa79d61f4199d99e477813d2d72a5a