Merge pull request #29 from brightray/chrome-29

Update to Chrome 29

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"

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<NetworkDelegate> network_delegate,
     content::ProtocolHandlerMap* protocol_handlers)
     : base_path_(base_path),

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 {
 

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 {