Fix Linux Views build breakage.

Revert 100828 - Move URLFetcher from content/common to content/common/net.

Add a OWNERS for content/common/net

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/7875006

TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/7884003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100829 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 11 insertions, 14 deletions

diff --git a/content/browser/geolocation/network_location_request.h b/content/browser/geolocation/network_location_request.h
index 8df175f..0694052 100644
--- a/content/browser/geolocation/network_location_request.h
+++ b/content/browser/geolocation/network_location_request.h
@@ -12,7 +12,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/geolocation/device_data_provider.h"
-#include "content/common/net/url_fetcher.h"
+#include "content/common/url_fetcher.h"
 #include "googleurl/src/gurl.h"
 
 class URLFetcher;
diff --git a/content/browser/speech/speech_recognition_request.h b/content/browser/speech/speech_recognition_request.h
index 0c79ed6..b6701a1 100644
--- a/content/browser/speech/speech_recognition_request.h
+++ b/content/browser/speech/speech_recognition_request.h
@@ -11,8 +11,8 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "content/common/net/url_fetcher.h"
 #include "content/common/speech_input_result.h"
+#include "content/common/url_fetcher.h"
 #include "googleurl/src/gurl.h"
 
 class URLFetcher;
diff --git a/content/common/net/OWNERS b/content/common/net/OWNERS
deleted file mode 100644
index 2f937b5..0000000
--- a/content/common/net/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-eroman@chromium.org
-willchan@chromium.org
diff --git a/content/common/net/url_fetcher.cc b/content/common/url_fetcher.cc
index be4d448..4493c07 100644
--- a/content/common/net/url_fetcher.cc
+++ b/content/common/url_fetcher.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/net/url_fetcher.h"
+#include "content/common/url_fetcher.h"
 
 #include <set>
 
diff --git a/content/common/net/url_fetcher.h b/content/common/url_fetcher.h
index 00ff56f..b3cee3b 100644
--- a/content/common/net/url_fetcher.h
+++ b/content/common/url_fetcher.h
@@ -11,8 +11,8 @@
 // temporary situation.  We will work on allowing support for multiple "io"
 // threads per process.
 
-#ifndef CONTENT_COMMON_NET_URL_FETCHER_H_
-#define CONTENT_COMMON_NET_URL_FETCHER_H_
+#ifndef CONTENT_COMMON_URL_FETCHER_H_
+#define CONTENT_COMMON_URL_FETCHER_H_
 #pragma once
 
 #include <string>
@@ -320,4 +320,4 @@ class URLFetcher {
   DISALLOW_COPY_AND_ASSIGN(URLFetcher);
 };
 
-#endif  // CONTENT_COMMON_NET_URL_FETCHER_H_
+#endif  // CONTENT_COMMON_URL_FETCHER_H_
diff --git a/content/common/net/url_fetcher_unittest.cc b/content/common/url_fetcher_unittest.cc
index 86411d1..e301fe8 100644
--- a/content/common/net/url_fetcher_unittest.cc
+++ b/content/common/url_fetcher_unittest.cc
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/net/url_fetcher.h"
-
 #include "base/message_loop_proxy.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
+#include "content/common/url_fetcher.h"
 #include "crypto/nss_util.h"
 #include "net/http/http_response_headers.h"
 #include "net/test/test_server.h"
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 2aa7cb7..5623da2 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -159,8 +159,6 @@
         'common/native_web_keyboard_event_win.cc',
         'common/navigation_gesture.h',
         'common/navigation_types.h',
-        'common/net/url_fetcher.cc',
-        'common/net/url_fetcher.h',
         'common/notification_details.cc',
         'common/notification_details.h',
         'common/notification_observer.h',
@@ -238,6 +236,8 @@
         'common/unix_domain_socket_posix.h',
         'common/url_constants.cc',
         'common/url_constants.h',
+        'common/url_fetcher.cc',
+        'common/url_fetcher.h',
         'common/utility_messages.h',
         'common/view_messages.h',
         'common/view_types.cc',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index b05062f..29e8809 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -126,11 +126,11 @@
         'common/gpu/gpu_feature_flags_unittest.cc',
         'common/gpu/gpu_info_unittest.cc',
         'common/hi_res_timer_manager_unittest.cc',
-        'common/net/url_fetcher_unittest.cc',
         'common/notification_service_unittest.cc',
         'common/process_watcher_unittest.cc',
         'common/property_bag_unittest.cc',
         'common/resource_dispatcher_unittest.cc',
+        'common/url_fetcher_unittest.cc',
         'gpu/gpu_info_collector_unittest.cc',
         'gpu/gpu_info_collector_unittest_win.cc',
         'renderer/active_notification_tracker_unittest.cc',
diff --git a/content/test/test_url_fetcher_factory.h b/content/test/test_url_fetcher_factory.h
index c003106..a286bad 100644
--- a/content/test/test_url_fetcher_factory.h
+++ b/content/test/test_url_fetcher_factory.h
@@ -12,7 +12,7 @@
 #include <utility>
 
 #include "base/threading/non_thread_safe.h"
-#include "content/common/net/url_fetcher.h"
+#include "content/common/url_fetcher.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request_status.h"