From 5b788476a569949348e07b82ad85fa7f7d033c8b Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Thu, 26 Jun 2014 16:29:38 -0400
Subject: [PATCH] Update for move of string symbols into base::

---
 brightray/browser/inspectable_web_contents_impl.cc | 2 +-
 brightray/browser/network_delegate.cc              | 2 +-
 brightray/browser/network_delegate.h               | 2 +-
 brightray/browser/url_request_context_getter.cc    | 2 +-
 brightray/common/content_client.cc                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/brightray/browser/inspectable_web_contents_impl.cc b/brightray/browser/inspectable_web_contents_impl.cc
index 1ccb4e1054d4..739acf44ecb1 100644
--- a/brightray/browser/inspectable_web_contents_impl.cc
+++ b/brightray/browser/inspectable_web_contents_impl.cc
@@ -117,7 +117,7 @@ void InspectableWebContentsImpl::UpdateFrontendDockSide() {
   auto javascript = base::StringPrintf(
       "InspectorFrontendAPI.setDockSide(\"%s\")", dock_side_.c_str());
   devtools_web_contents_->GetRenderViewHost()->ExecuteJavascriptInWebFrame(
-      string16(), ASCIIToUTF16(javascript));
+      base::string16(), base::ASCIIToUTF16(javascript));
 }
 
 void InspectableWebContentsImpl::ActivateWindow() {
diff --git a/brightray/browser/network_delegate.cc b/brightray/browser/network_delegate.cc
index 6467dc3e3d6f..a915752b382f 100644
--- a/brightray/browser/network_delegate.cc
+++ b/brightray/browser/network_delegate.cc
@@ -59,7 +59,7 @@ void NetworkDelegate::OnURLRequestDestroyed(net::URLRequest* request) {
 }
 
 void NetworkDelegate::OnPACScriptError(int line_number,
-                                            const string16& error) {
+                                       const base::string16& error) {
 }
 
 NetworkDelegate::AuthRequiredResponse NetworkDelegate::OnAuthRequired(
diff --git a/brightray/browser/network_delegate.h b/brightray/browser/network_delegate.h
index 0d4f2d3600c5..3e258ac14f1c 100644
--- a/brightray/browser/network_delegate.h
+++ b/brightray/browser/network_delegate.h
@@ -37,7 +37,7 @@ class NetworkDelegate : public net::NetworkDelegate {
   virtual void OnCompleted(net::URLRequest* request, bool started) OVERRIDE;
   virtual void OnURLRequestDestroyed(net::URLRequest* request) OVERRIDE;
   virtual void OnPACScriptError(int line_number,
-                                const string16& error) OVERRIDE;
+                                const base::string16& error) OVERRIDE;
   virtual AuthRequiredResponse OnAuthRequired(
       net::URLRequest* request,
       const net::AuthChallengeInfo& auth_info,
diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc
index 0e590aa5429b..47debda7ae98 100644
--- a/brightray/browser/url_request_context_getter.cc
+++ b/brightray/browser/url_request_context_getter.cc
@@ -85,7 +85,7 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
         base::WorkerPool::GetTaskRunner(true)));
     storage_->set_http_user_agent_settings(
         new net::StaticHttpUserAgentSettings(
-            "en-us,en", EmptyString()));
+            "en-us,en", base::EmptyString()));
 
     scoped_ptr<net::HostResolver> host_resolver(
         net::HostResolver::CreateDefaultResolver(NULL));
diff --git a/brightray/common/content_client.cc b/brightray/common/content_client.cc
index dd6ce530690c..3fd5f930183f 100644
--- a/brightray/common/content_client.cc
+++ b/brightray/common/content_client.cc
@@ -21,7 +21,7 @@ ContentClient::~ContentClient() {
 
 std::string ContentClient::GetProduct() const {
   auto name = GetApplicationName();
-  RemoveChars(name, kWhitespaceASCII, &name);
+  base::RemoveChars(name, base::kWhitespaceASCII, &name);
   return base::StringPrintf("%s/%s",
       name.c_str(), GetApplicationVersion().c_str());
 }