Removing unnecessary content:: namespace qualifier.

TBR=jam@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11737002

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

15 files changed, 49 insertions, 62 deletions

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 84a9622..e7faa9e 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -638,7 +638,6 @@ void BrowserMainLoop::InitializeMainThread() {
                                            MessageLoop::current()));
 }
 
-
 void BrowserMainLoop::BrowserThreadsStarted() {
 #if !defined(OS_IOS)
   HistogramSynchronizer::GetInstance();
@@ -686,7 +685,7 @@ void BrowserMainLoop::BrowserThreadsStarted() {
   // since creating the GPU thread races against creation of the one-and-only
   // ChildProcess instance which is created by the renderer thread.
   if (GpuDataManagerImpl::GetInstance()->GpuAccessAllowed() &&
-      content::IsForceCompositingModeEnabled() &&
+      IsForceCompositingModeEnabled() &&
       !parsed_command_line_.HasSwitch(switches::kDisableGpuProcessPrelaunch) &&
       !parsed_command_line_.HasSwitch(switches::kSingleProcess) &&
       !parsed_command_line_.HasSwitch(switches::kInProcessGPU)) {
diff --git a/content/browser/browser_thread_impl.cc b/content/browser/browser_thread_impl.cc
index f61c0a2..e046ce4 100644
--- a/content/browser/browser_thread_impl.cc
+++ b/content/browser/browser_thread_impl.cc
@@ -46,8 +46,8 @@ struct BrowserThreadGlobals {
 
   // This array is protected by |lock|. The threads are not owned by this
   // array. Typically, the threads are owned on the UI thread by
-  // content::BrowserMainLoop. BrowserThreadImpl objects remove themselves from
-  // this array upon destruction.
+  // BrowserMainLoop. BrowserThreadImpl objects remove themselves from this
+  // array upon destruction.
   BrowserThreadImpl* threads[BrowserThread::ID_COUNT];
 
   // Only atomic operations are used on this array. The delegates are not owned
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
index a418942..8de181d 100644
--- a/content/browser/child_process_launcher.cc
+++ b/content/browser/child_process_launcher.cc
@@ -165,8 +165,7 @@ class ChildProcessLauncher::Context
     scoped_ptr<CommandLine> cmd_line_deleter(cmd_line);
 
 #if defined(OS_WIN)
-    base::ProcessHandle handle = content::StartProcessWithAccess(
-        cmd_line, exposed_dir);
+    base::ProcessHandle handle = StartProcessWithAccess(cmd_line, exposed_dir);
 #elif defined(OS_ANDROID)
     std::string process_type =
         cmd_line->GetSwitchValueASCII(switches::kProcessType);
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
index fa033fd..908c075 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -152,9 +152,8 @@ class SitePerProcessBrowserTest : public ContentBrowserTest {
         NOTIFICATION_LOAD_STOP,
         Source<NavigationController>(
             &shell()->web_contents()->GetController()));
-    bool result = content::ExecuteJavaScript(
-        window->web_contents()->GetRenderViewHost(),
-        L"", ASCIIToWide(script));
+    bool result = ExecuteJavaScript(window->web_contents()->GetRenderViewHost(),
+                                    L"", ASCIIToWide(script));
     load_observer.Wait();
     return result;
   }
diff --git a/content/common/child_process_host_impl.cc b/content/common/child_process_host_impl.cc
index 701ea63..a676b75 100644
--- a/content/common/child_process_host_impl.cc
+++ b/content/common/child_process_host_impl.cc
@@ -104,7 +104,7 @@ FilePath ChildProcessHost::GetChildPath(int flags) {
   // On most platforms, the child executable is the same as the current
   // executable.
   if (child_path.empty())
-    PathService::Get(content::CHILD_PROCESS_EXE, &child_path);
+    PathService::Get(CHILD_PROCESS_EXE, &child_path);
 
 #if defined(OS_MACOSX)
   DCHECK(!(flags & CHILD_NO_PIE && flags & CHILD_ALLOW_HEAP_EXECUTION));
diff --git a/content/common/handle_enumerator_win.cc b/content/common/handle_enumerator_win.cc
index 424c55e..299d664 100644
--- a/content/common/handle_enumerator_win.cc
+++ b/content/common/handle_enumerator_win.cc
@@ -17,41 +17,35 @@
 #include "content/public/common/result_codes.h"
 #include "sandbox/win/src/handle_table.h"
 
+namespace content {
 namespace {
 
-typedef std::map<const string16, content::HandleType> HandleTypeMap;
+typedef std::map<const string16, HandleType> HandleTypeMap;
 
 HandleTypeMap& MakeHandleTypeMap() {
   HandleTypeMap& handle_types = *(new HandleTypeMap());
-  handle_types[sandbox::HandleTable::kTypeProcess] = content::ProcessHandle;
-  handle_types[sandbox::HandleTable::kTypeThread] = content::ThreadHandle;
-  handle_types[sandbox::HandleTable::kTypeFile] = content::FileHandle;
-  handle_types[sandbox::HandleTable::kTypeDirectory] =
-      content::DirectoryHandle;
-  handle_types[sandbox::HandleTable::kTypeKey] = content::KeyHandle;
-  handle_types[sandbox::HandleTable::kTypeWindowStation] =
-      content::WindowStationHandle;
-  handle_types[sandbox::HandleTable::kTypeDesktop] = content::DesktopHandle;
-  handle_types[sandbox::HandleTable::kTypeService] = content::ServiceHandle;
-  handle_types[sandbox::HandleTable::kTypeMutex] = content::MutexHandle;
-  handle_types[sandbox::HandleTable::kTypeSemaphore] =
-      content::SemaphoreHandle;
-  handle_types[sandbox::HandleTable::kTypeEvent] = content::EventHandle;
-  handle_types[sandbox::HandleTable::kTypeTimer] = content::TimerHandle;
-  handle_types[sandbox::HandleTable::kTypeNamedPipe] =
-      content::NamedPipeHandle;
-  handle_types[sandbox::HandleTable::kTypeJobObject] = content::JobHandle;
-  handle_types[sandbox::HandleTable::kTypeFileMap] = content::FileMapHandle;
-  handle_types[sandbox::HandleTable::kTypeAlpcPort] =
-      content::AlpcPortHandle;
+  handle_types[sandbox::HandleTable::kTypeProcess] = ProcessHandle;
+  handle_types[sandbox::HandleTable::kTypeThread] = ThreadHandle;
+  handle_types[sandbox::HandleTable::kTypeFile] = FileHandle;
+  handle_types[sandbox::HandleTable::kTypeDirectory] = DirectoryHandle;
+  handle_types[sandbox::HandleTable::kTypeKey] = KeyHandle;
+  handle_types[sandbox::HandleTable::kTypeWindowStation] = WindowStationHandle;
+  handle_types[sandbox::HandleTable::kTypeDesktop] = DesktopHandle;
+  handle_types[sandbox::HandleTable::kTypeService] = ServiceHandle;
+  handle_types[sandbox::HandleTable::kTypeMutex] = MutexHandle;
+  handle_types[sandbox::HandleTable::kTypeSemaphore] = SemaphoreHandle;
+  handle_types[sandbox::HandleTable::kTypeEvent] = EventHandle;
+  handle_types[sandbox::HandleTable::kTypeTimer] = TimerHandle;
+  handle_types[sandbox::HandleTable::kTypeNamedPipe] = NamedPipeHandle;
+  handle_types[sandbox::HandleTable::kTypeJobObject] = JobHandle;
+  handle_types[sandbox::HandleTable::kTypeFileMap] = FileMapHandle;
+  handle_types[sandbox::HandleTable::kTypeAlpcPort] = AlpcPortHandle;
 
   return handle_types;
 }
 
 }  // namespace
 
-namespace content {
-
 const size_t kMaxHandleNameLength = 1024;
 
 void HandleEnumerator::EnumerateHandles() {
diff --git a/content/common/indexed_db/proxy_webidbobjectstore_impl.cc b/content/common/indexed_db/proxy_webidbobjectstore_impl.cc
index e34e2da..9b2f1c9 100644
--- a/content/common/indexed_db/proxy_webidbobjectstore_impl.cc
+++ b/content/common/indexed_db/proxy_webidbobjectstore_impl.cc
@@ -20,7 +20,6 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 
-using content::SerializedScriptValue;
 using WebKit::WebDOMStringList;
 using WebKit::WebExceptionCode;
 using WebKit::WebFrame;
@@ -88,12 +87,12 @@ void RendererWebIDBObjectStoreImpl::setIndexKeys(
     index_ids_list[i] = index_ids[i];
   }
 
-  std::vector<std::vector<content::IndexedDBKey> >
+  std::vector<std::vector<IndexedDBKey> >
           index_keys_list(index_keys.size());
   for (size_t i = 0; i < index_keys.size(); ++i) {
     index_keys_list[i].resize(index_keys[i].size());
     for (size_t j = 0; j < index_keys[i].size(); ++j) {
-      index_keys_list[i][j] = content::IndexedDBKey(index_keys[i][j]);
+      index_keys_list[i][j] = IndexedDBKey(index_keys[i][j]);
     }
   }
   IndexedDBDispatcher::Send(new IndexedDBHostMsg_ObjectStoreSetIndexKeys(
diff --git a/content/common/socket_stream_dispatcher.cc b/content/common/socket_stream_dispatcher.cc
index d4bf448..7067941 100644
--- a/content/common/socket_stream_dispatcher.cc
+++ b/content/common/socket_stream_dispatcher.cc
@@ -30,7 +30,7 @@ class IPCWebSocketStreamHandleBridge
       ChildThread* child_thread,
       WebKit::WebSocketStreamHandle* handle,
       webkit_glue::WebSocketStreamHandleDelegate* delegate)
-      : socket_id_(content::kNoSocketId),
+      : socket_id_(kNoSocketId),
         child_thread_(child_thread),
         handle_(handle),
         delegate_(delegate) {}
@@ -77,9 +77,9 @@ IPCWebSocketStreamHandleBridge* IPCWebSocketStreamHandleBridge::FromSocketId(
 IPCWebSocketStreamHandleBridge::~IPCWebSocketStreamHandleBridge() {
   DVLOG(1) << "IPCWebSocketStreamHandleBridge destructor socket_id="
            << socket_id_;
-  if (socket_id_ != content::kNoSocketId) {
+  if (socket_id_ != kNoSocketId) {
     child_thread_->Send(new SocketStreamHostMsg_Close(socket_id_));
-    socket_id_ = content::kNoSocketId;
+    socket_id_ = kNoSocketId;
   }
 }
 
@@ -131,9 +131,9 @@ void IPCWebSocketStreamHandleBridge::OnReceivedData(
 
 void IPCWebSocketStreamHandleBridge::OnClosed() {
   DVLOG(1) << "IPCWebSocketStreamHandleBridge::OnClosed";
-  if (socket_id_ != content::kNoSocketId) {
+  if (socket_id_ != kNoSocketId) {
     all_bridges.Get().Remove(socket_id_);
-    socket_id_ = content::kNoSocketId;
+    socket_id_ = kNoSocketId;
   }
   if (delegate_)
     delegate_->DidClose(handle_);
@@ -143,12 +143,12 @@ void IPCWebSocketStreamHandleBridge::OnClosed() {
 
 void IPCWebSocketStreamHandleBridge::DoConnect(const GURL& url) {
   DCHECK(child_thread_);
-  DCHECK_EQ(socket_id_, content::kNoSocketId);
+  DCHECK_EQ(socket_id_, kNoSocketId);
   if (delegate_)
     delegate_->WillOpenStream(handle_, url);
 
   socket_id_ = all_bridges.Get().Add(this);
-  DCHECK_NE(socket_id_, content::kNoSocketId);
+  DCHECK_NE(socket_id_, kNoSocketId);
   int render_view_id = MSG_ROUTING_NONE;
   const SocketStreamHandleData* data =
       SocketStreamHandleData::ForHandle(handle_);
diff --git a/content/common/webkitplatformsupport_impl.cc b/content/common/webkitplatformsupport_impl.cc
index e25c267..d3dcc34 100644
--- a/content/common/webkitplatformsupport_impl.cc
+++ b/content/common/webkitplatformsupport_impl.cc
@@ -25,14 +25,13 @@ WebKitPlatformSupportImpl::~WebKitPlatformSupportImpl() {
 }
 
 string16 WebKitPlatformSupportImpl::GetLocalizedString(int message_id) {
-  return content::GetContentClient()->GetLocalizedString(message_id);
+  return GetContentClient()->GetLocalizedString(message_id);
 }
 
 base::StringPiece WebKitPlatformSupportImpl::GetDataResource(
     int resource_id,
     ui::ScaleFactor scale_factor) {
-  return content::GetContentClient()->GetDataResource(resource_id,
-                                                      scale_factor);
+  return GetContentClient()->GetDataResource(resource_id, scale_factor);
 }
 
 void WebKitPlatformSupportImpl::GetPlugins(
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc
index 06bfc80..6f15ef2 100644
--- a/content/ppapi_plugin/ppapi_thread.cc
+++ b/content/ppapi_plugin/ppapi_thread.cc
@@ -238,7 +238,7 @@ void PpapiThread::OnMsgLoadPlugin(const FilePath& path,
   // Trusted Pepper plugins may be "internal", i.e. built-in to the browser
   // binary.  If we're being asked to load such a plugin (e.g. the Chromoting
   // client) then fetch the entry points from the embedder, rather than a DLL.
-  std::vector<content::PepperPluginInfo> plugins;
+  std::vector<PepperPluginInfo> plugins;
   GetContentClient()->AddPepperPlugins(&plugins);
   for (size_t i = 0; i < plugins.size(); ++i) {
     if (plugins[i].is_internal && plugins[i].path == path) {
diff --git a/content/renderer/password_form_conversion_utils.cc b/content/renderer/password_form_conversion_utils.cc
index cc72816..e38d1dd 100644
--- a/content/renderer/password_form_conversion_utils.cc
+++ b/content/renderer/password_form_conversion_utils.cc
@@ -10,11 +10,12 @@
 using WebKit::WebFormElement;
 using WebKit::WebPasswordFormData;
 
+namespace content {
 namespace {
 
-scoped_ptr<content::PasswordForm> InitPasswordFormFromWebPasswordForm(
+scoped_ptr<PasswordForm> InitPasswordFormFromWebPasswordForm(
     const WebKit::WebPasswordFormData& web_password_form) {
-  content::PasswordForm* password_form = new content::PasswordForm();
+  PasswordForm* password_form = new PasswordForm();
   password_form->signon_realm = web_password_form.signonRealm.utf8();
   password_form->origin = web_password_form.origin;
   password_form->action = web_password_form.action;
@@ -27,18 +28,16 @@ scoped_ptr<content::PasswordForm> InitPasswordFormFromWebPasswordForm(
       web_password_form.passwordShouldAutocomplete;
   password_form->old_password_element = web_password_form.oldPasswordElement;
   password_form->old_password_value = web_password_form.oldPasswordValue;
-  password_form->scheme = content::PasswordForm::SCHEME_HTML;
+  password_form->scheme = PasswordForm::SCHEME_HTML;
   password_form->ssl_valid = false;
   password_form->preferred = false;
   password_form->blacklisted_by_user = false;
-  password_form->type = content::PasswordForm::TYPE_MANUAL;
-  return scoped_ptr<content::PasswordForm>(password_form);
+  password_form->type = PasswordForm::TYPE_MANUAL;
+  return scoped_ptr<PasswordForm>(password_form);
 }
 
 }  // namespace
 
-namespace content {
-
 scoped_ptr<PasswordForm> CreatePasswordForm(const WebFormElement& webform) {
   WebPasswordFormData web_password_form(webform);
   if (web_password_form.isValid())
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index ab837eb..39616ac 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -320,9 +320,9 @@ void RenderThreadImpl::Init() {
   idle_notifications_to_skip_ = 0;
   compositor_initialized_ = false;
 
-  appcache_dispatcher_.reset(new content::AppCacheDispatcher(Get()));
+  appcache_dispatcher_.reset(new AppCacheDispatcher(Get()));
   dom_storage_dispatcher_.reset(new DomStorageDispatcher());
-  main_thread_indexed_db_dispatcher_.reset(new content::IndexedDBDispatcher());
+  main_thread_indexed_db_dispatcher_.reset(new IndexedDBDispatcher());
 
   media_stream_center_ = NULL;
 
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 24d275e..87f363f 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -5142,7 +5142,7 @@ void RenderViewImpl::OnCSSInsertRequest(const string16& frame_xpath,
 void RenderViewImpl::OnAllowBindings(int enabled_bindings_flags) {
   if ((enabled_bindings_flags & BINDINGS_POLICY_WEB_UI) &&
       !(enabled_bindings_ & BINDINGS_POLICY_WEB_UI)) {
-    RenderThread::Get()->RegisterExtension(content::WebUIExtension::Get());
+    RenderThread::Get()->RegisterExtension(WebUIExtension::Get());
     new WebUIExtensionData(this);
   }
 
diff --git a/content/renderer/renderer_main_platform_delegate_win.cc b/content/renderer/renderer_main_platform_delegate_win.cc
index 959bee5..ea33fe3 100644
--- a/content/renderer/renderer_main_platform_delegate_win.cc
+++ b/content/renderer/renderer_main_platform_delegate_win.cc
@@ -32,8 +32,7 @@ void SkiaPreCacheFont(const LOGFONT& logfont) {
 void SkiaPreCacheFontCharacters(const LOGFONT& logfont,
                                 const wchar_t* text,
                                 unsigned int text_length) {
-  content::RenderThreadImpl* render_thread_impl =
-      content::RenderThreadImpl::current();
+  RenderThreadImpl* render_thread_impl = RenderThreadImpl::current();
   if (render_thread_impl) {
     render_thread_impl->PreCacheFontCharacters(logfont,
                                                string16(text, text_length));
diff --git a/content/worker/worker_thread.cc b/content/worker/worker_thread.cc
index 8de02a9..3dd90fbb 100644
--- a/content/worker/worker_thread.cc
+++ b/content/worker/worker_thread.cc
@@ -34,7 +34,7 @@ WorkerThread::WorkerThread() {
   webkit_platform_support_.reset(new WorkerWebKitPlatformSupportImpl);
   WebKit::initialize(webkit_platform_support_.get());
 
-  appcache_dispatcher_.reset(new content::AppCacheDispatcher(this));
+  appcache_dispatcher_.reset(new AppCacheDispatcher(this));
 
   web_database_observer_impl_.reset(
       new WebDatabaseObserverImpl(sync_message_filter()));
@@ -42,7 +42,7 @@ WorkerThread::WorkerThread() {
   db_message_filter_ = new DBMessageFilter();
   channel()->AddFilter(db_message_filter_.get());
 
-  indexed_db_message_filter_ = new content::IndexedDBMessageFilter;
+  indexed_db_message_filter_ = new IndexedDBMessageFilter;
   channel()->AddFilter(indexed_db_message_filter_.get());
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();