diff --git a/brightray/browser/browser_main_parts.cc b/brightray/browser/browser_main_parts.cc
index c37100a76e9a..57f4f9d1fff4 100644
--- a/brightray/browser/browser_main_parts.cc
+++ b/brightray/browser/browser_main_parts.cc
@@ -54,7 +54,6 @@
 #include "device/bluetooth/dbus/dbus_bluez_manager_wrapper_linux.h"
 #endif
 
-using content::BrowserThread;
 
 namespace brightray {
 
@@ -107,7 +106,7 @@ NOINLINE void WaitingForUIThreadToHandleIOError() {
 }
 
 int BrowserX11IOErrorHandler(Display* d) {
-  if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
+  if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
     // Wait for the UI thread (which has a different connection to the X server)
     // to get the error. We can't call shutdown from this thread without
     // tripping an error. Doing it through a function so that we'll be able
diff --git a/brightray/browser/devtools_file_system_indexer.cc b/brightray/browser/devtools_file_system_indexer.cc
index 1700ff0eb990..e41830258fdc 100644
--- a/brightray/browser/devtools_file_system_indexer.cc
+++ b/brightray/browser/devtools_file_system_indexer.cc
@@ -205,7 +205,7 @@ vector<FilePath> Index::Search(string query) {
   vector<FilePath> result;
   FileIdsMap::const_iterator ids_it = file_ids_.begin();
   for (; ids_it != file_ids_.end(); ++ids_it) {
-    if (trigrams.size() == 0 ||
+    if (trigrams.empty() ||
         file_ids.find(ids_it->second) != file_ids.end()) {
       result.push_back(ids_it->first);
     }
diff --git a/brightray/browser/net/devtools_network_controller.cc b/brightray/browser/net/devtools_network_controller.cc
index cfa4e2347123..07b469b1f77c 100644
--- a/brightray/browser/net/devtools_network_controller.cc
+++ b/brightray/browser/net/devtools_network_controller.cc
@@ -67,7 +67,7 @@ DevToolsNetworkInterceptor*
 DevToolsNetworkController::GetInterceptor(const std::string& client_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
-  if (!interceptors_.size() || client_id.empty())
+  if (interceptors_.empty() || client_id.empty())
     return nullptr;
 
   DevToolsNetworkInterceptor* interceptor = interceptors_.get(client_id);
diff --git a/brightray/browser/net/devtools_network_interceptor.cc b/brightray/browser/net/devtools_network_interceptor.cc
index f0e3e0e488d8..73e8538310db 100644
--- a/brightray/browser/net/devtools_network_interceptor.cc
+++ b/brightray/browser/net/devtools_network_interceptor.cc
@@ -108,7 +108,7 @@ uint64_t DevToolsNetworkInterceptor::UpdateThrottledRecords(
     uint64_t last_tick,
     base::TimeDelta tick_length) {
   if (tick_length.is_zero()) {
-    DCHECK(!records->size());
+    DCHECK(records->empty());
     return last_tick;
   }
 
@@ -195,7 +195,7 @@ base::TimeTicks DevToolsNetworkInterceptor::CalculateDesiredTime(
 
 void DevToolsNetworkInterceptor::ArmTimer(base::TimeTicks now) {
   size_t suspend_count = suspended_.size();
-  if (!download_.size() && !upload_.size() && !suspend_count) {
+  if (download_.empty() && upload_.empty() && !suspend_count) {
     timer_.Stop();
     return;
   }