summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-08 20:35:10 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-08 20:35:10 +0000
commit9d9221f0615f685b209ee5240a8e8e0cb8118454 (patch)
tree0c1f29f0c2f1db84144f03b8153d88af3d7a1005 /chrome/browser/extensions
parent3d57bfd273ccb467e50110c137b79d5bcf1a5e14 (diff)
downloadchromium_src-9d9221f0615f685b209ee5240a8e8e0cb8118454.zip
chromium_src-9d9221f0615f685b209ee5240a8e8e0cb8118454.tar.gz
chromium_src-9d9221f0615f685b209ee5240a8e8e0cb8118454.tar.bz2
Revert 262487 "Add net/base/filename_util.h."
> Add net/base/filename_util.h. > > Moved some filename-related functions from net_util.h to the new > filename_util.h . > > BUG=276739 > R=piman@chromium.org, rsleevi@chromium.org > TBR=kalman@chromium.org, piman@chromium.org, sky@chromium.org > > Review URL: https://codereview.chromium.org/220253002 TBR=sergeyu@chromium.org Review URL: https://codereview.chromium.org/228763004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262498 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/api/downloads/downloads_api.cc2
-rw-r--r--chrome/browser/extensions/api/execute_code_function.cc2
-rw-r--r--chrome/browser/extensions/api/push_messaging/sync_setup_helper.h4
-rw-r--r--chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc2
-rw-r--r--chrome/browser/extensions/extension_apitest.cc2
-rw-r--r--chrome/browser/extensions/extension_startup_browsertest.cc2
-rw-r--r--chrome/browser/extensions/plugin_apitest.cc2
7 files changed, 6 insertions, 10 deletions
diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc
index 7342c694..209ffb3 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc
@@ -72,8 +72,8 @@
#include "extensions/browser/extension_system.h"
#include "extensions/common/extension.h"
#include "extensions/common/permissions/permissions_data.h"
-#include "net/base/filename_util.h"
#include "net/base/load_flags.h"
+#include "net/base/net_util.h"
#include "net/http/http_util.h"
#include "net/url_request/url_request.h"
#include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/extensions/api/execute_code_function.cc b/chrome/browser/extensions/api/execute_code_function.cc
index 39427fc..9a7ec7d 100644
--- a/chrome/browser/extensions/api/execute_code_function.cc
+++ b/chrome/browser/extensions/api/execute_code_function.cc
@@ -13,7 +13,7 @@
#include "extensions/browser/file_reader.h"
#include "extensions/common/error_utils.h"
#include "extensions/common/extension_messages.h"
-#include "net/base/filename_util.h"
+#include "net/base/net_util.h"
#include "ui/base/resource/resource_bundle.h"
namespace extensions {
diff --git a/chrome/browser/extensions/api/push_messaging/sync_setup_helper.h b/chrome/browser/extensions/api/push_messaging/sync_setup_helper.h
index e31accf..39be4fe 100644
--- a/chrome/browser/extensions/api/push_messaging/sync_setup_helper.h
+++ b/chrome/browser/extensions/api/push_messaging/sync_setup_helper.h
@@ -15,10 +15,6 @@
class Profile;
class ProfileSyncServiceHarness;
-namespace base {
-class FilePath;
-}
-
namespace extensions {
class SyncSetupHelper {
diff --git a/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc b/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc
index c78dae6..c4b3deb 100644
--- a/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc
+++ b/chrome/browser/extensions/docs/examples/apps/calculator_browsertest.cc
@@ -11,7 +11,7 @@
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/web_contents.h"
#include "content/public/test/browser_test_utils.h"
-#include "net/base/filename_util.h"
+#include "net/base/net_util.h"
class CalculatorBrowserTest : public InProcessBrowserTest {
};
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index f388524..8de65ee 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -21,7 +21,7 @@
#include "extensions/common/extension.h"
#include "extensions/common/extension_set.h"
#include "net/base/escape.h"
-#include "net/base/filename_util.h"
+#include "net/base/net_util.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "net/test/embedded_test_server/http_request.h"
#include "net/test/embedded_test_server/http_response.h"
diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc
index 16c949e..459de6e 100644
--- a/chrome/browser/extensions/extension_startup_browsertest.cc
+++ b/chrome/browser/extensions/extension_startup_browsertest.cc
@@ -34,7 +34,7 @@
#include "extensions/common/extension.h"
#include "extensions/common/extension_set.h"
#include "extensions/common/feature_switch.h"
-#include "net/base/filename_util.h"
+#include "net/base/net_util.h"
using extensions::FeatureSwitch;
diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc
index 21170d8..520ee7b 100644
--- a/chrome/browser/extensions/plugin_apitest.cc
+++ b/chrome/browser/extensions/plugin_apitest.cc
@@ -20,7 +20,7 @@
#include "content/public/test/browser_test_utils.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/extension.h"
-#include "net/base/filename_util.h"
+#include "net/base/net_util.h"
using content::NavigationController;
using content::WebContents;