Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540

10 files changed, 14 insertions, 14 deletions

diff --git a/extensions/common/error_utils.cc b/extensions/common/error_utils.cc
index 2979184e1e..bd4d32e0d2 100644
--- a/extensions/common/error_utils.cc
+++ b/extensions/common/error_utils.cc
@@ -4,8 +4,8 @@
 
 #include "extensions/common/error_utils.h"
 
-#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 
 namespace extensions {
 
diff --git a/extensions/common/error_utils.h b/extensions/common/error_utils.h
index f63f4da162..c4d012ae2c 100644
--- a/extensions/common/error_utils.h
+++ b/extensions/common/error_utils.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 
 namespace extensions {
 
diff --git a/extensions/common/id_util.cc b/extensions/common/id_util.cc
index 5bdeba42aa..3b8628ee04 100644
--- a/extensions/common/id_util.cc
+++ b/extensions/common/id_util.cc
@@ -5,8 +5,8 @@
 #include "extensions/common/id_util.h"
 
 #include "base/files/file_path.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "crypto/sha2.h"
 
 namespace {
diff --git a/extensions/common/matcher/regex_set_matcher.cc b/extensions/common/matcher/regex_set_matcher.cc
index 3052a637db..af8027cdd3 100644
--- a/extensions/common/matcher/regex_set_matcher.cc
+++ b/extensions/common/matcher/regex_set_matcher.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "extensions/common/matcher/substring_set_matcher.h"
 #include "third_party/re2/re2/filtered_re2.h"
 #include "third_party/re2/re2/re2.h"
diff --git a/extensions/common/matcher/url_matcher_factory.cc b/extensions/common/matcher/url_matcher_factory.cc
index d35d032307..eb1548ca89 100644
--- a/extensions/common/matcher/url_matcher_factory.cc
+++ b/extensions/common/matcher/url_matcher_factory.cc
@@ -9,7 +9,7 @@
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/matcher/url_matcher_constants.h"
diff --git a/extensions/common/matcher/url_matcher_factory_unittest.cc b/extensions/common/matcher/url_matcher_factory_unittest.cc
index 1f569165ef..0b4def3924 100644
--- a/extensions/common/matcher/url_matcher_factory_unittest.cc
+++ b/extensions/common/matcher/url_matcher_factory_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/basictypes.h"
 #include "base/format_macros.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "extensions/common/matcher/url_matcher_constants.h"
 #include "googleurl/src/gurl.h"
@@ -244,7 +244,7 @@ void UrlConditionCaseTest::CheckCondition(
       matcher.condition_factory(), &condition, 1, &error);
   if (expected_result == CREATE_FAILURE) {
     EXPECT_FALSE(error.empty());
-    EXPECT_FALSE(result);
+    EXPECT_FALSE(result.get());
     return;
   }
   EXPECT_EQ("", error);
diff --git a/extensions/common/matcher/url_matcher_unittest.cc b/extensions/common/matcher/url_matcher_unittest.cc
index 7ccc058f0a..15a41a16bf 100644
--- a/extensions/common/matcher/url_matcher_unittest.cc
+++ b/extensions/common/matcher/url_matcher_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "extensions/common/matcher/url_matcher.h"
 
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/extensions/common/one_shot_event.cc b/extensions/common/one_shot_event.cc
index e654e3e199..318acad5c6 100644
--- a/extensions/common/one_shot_event.cc
+++ b/extensions/common/one_shot_event.cc
@@ -19,7 +19,7 @@ struct OneShotEvent::TaskInfo {
            const scoped_refptr<TaskRunner>& runner,
            const base::Closure& task)
       : from_here(from_here), runner(runner), task(task) {
-    CHECK(runner);  // Detect mistakes with a decent stack frame.
+    CHECK(runner.get());  // Detect mistakes with a decent stack frame.
   }
   tracked_objects::Location from_here;
   scoped_refptr<TaskRunner> runner;
diff --git a/extensions/common/one_shot_event_unittest.cc b/extensions/common/one_shot_event_unittest.cc
index ec2ddfd0fe..4009a0106a 100644
--- a/extensions/common/one_shot_event_unittest.cc
+++ b/extensions/common/one_shot_event_unittest.cc
@@ -58,7 +58,7 @@ TEST(OneShotEventTest, PostDefaultsToCurrentMessageLoop) {
   OneShotEvent event;
   scoped_refptr<base::TestSimpleTaskRunner> runner(
       new base::TestSimpleTaskRunner);
-  MessageLoop loop;
+  base::MessageLoop loop;
   int runner_i = 0;
   int loop_i = 0;
 
diff --git a/extensions/common/url_pattern.cc b/extensions/common/url_pattern.cc
index 17983dc5f3..fe1f269398 100644
--- a/extensions/common/url_pattern.cc
+++ b/extensions/common/url_pattern.cc
@@ -4,10 +4,10 @@
 
 #include "extensions/common/url_pattern.h"
 
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
 #include "googleurl/src/gurl.h"