commit 868fa2fe829687343ffae624259930155e16dbd8
author Torne (Richard Coles) <torne@google.com> Tue Jun 11 10:57:03 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Tue Jun 11 10:57:03 2013 +0100
tree 54d316199dd9739c57c3aacd131853bbd6554a94
parent bb1bdbd796f966b5bf11f40ecbea12621c7bfac9

Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540

chrome_frame/navigation_constraints.cc

diff --git a/chrome_frame/navigation_constraints.cc b/chrome_frame/navigation_constraints.cc
index 9b0bc71..33f4216 100644
--- a/chrome_frame/navigation_constraints.cc
+++ b/chrome_frame/navigation_constraints.cc
@@ -4,8 +4,8 @@
 
 #include "chrome_frame/navigation_constraints.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"
 #include "chrome/common/url_constants.h"
 #include "chrome_frame/utils.h"
 #include "extensions/common/constants.h"
@@ -32,7 +32,7 @@
 
   // Additional checking for view-source. Allow only http and https
   // URLs in view source.
-  if (url.SchemeIs(chrome::kViewSourceScheme)) {
+  if (url.SchemeIs(content::kViewSourceScheme)) {
     GURL sub_url(url.path());
     if (sub_url.SchemeIs(chrome::kHttpScheme) ||
         sub_url.SchemeIs(chrome::kHttpsScheme))