Convert to using new JNINamespace for content files.

Avoids wrapping the includes in the content namespace for the JNI
headers.

Cleans up some style issues I missed in web_settings as well.  Unnecessary
braces around single line conditionals.  Removed some unnecessary content
namespacing of methods.

BUG=
TEST=


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

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

5 files changed, 30 insertions, 38 deletions

diff --git a/content/app/android/sandboxed_process_service.cc b/content/app/android/sandboxed_process_service.cc
index 6954d28..e36d713 100644
--- a/content/app/android/sandboxed_process_service.cc
+++ b/content/app/android/sandboxed_process_service.cc
@@ -36,8 +36,8 @@ class SurfaceTexturePeerSandboxedImpl : public content::SurfaceTexturePeer {
                                            int primary_id,
                                            int secondary_id) {
     JNIEnv* env = base::android::AttachCurrentThread();
-    Java_SandboxedProcessService_establishSurfaceTexturePeer(env, service_,
-        pid, type, j_surface_texture, primary_id, secondary_id);
+    content::Java_SandboxedProcessService_establishSurfaceTexturePeer(
+       env, service_,  pid, type, j_surface_texture, primary_id, secondary_id);
     CheckException(env);
   }
 
@@ -70,12 +70,14 @@ void InternalInitSandboxedProcess(int ipc_fd,
 
 }  // namespace <anonymous>
 
-static void InitSandboxedProcess(JNIEnv* env,
-                                 jclass clazz,
-                                 jobject context,
-                                 jobject service,
-                                 jint ipc_fd,
-                                 jint crash_fd) {
+namespace content {
+
+void InitSandboxedProcess(JNIEnv* env,
+                          jclass clazz,
+                          jobject context,
+                          jobject service,
+                          jint ipc_fd,
+                          jint crash_fd) {
   InternalInitSandboxedProcess(static_cast<int>(ipc_fd),
       static_cast<int>(crash_fd), env, clazz, context, service);
 
@@ -84,16 +86,12 @@ static void InitSandboxedProcess(JNIEnv* env,
   LOG(INFO) << "SandboxedProcessService: Drop out of SandboxedProcessMain.";
 }
 
-static void ExitSandboxedProcess(JNIEnv* env, jclass clazz) {
+void ExitSandboxedProcess(JNIEnv* env, jclass clazz) {
   LOG(INFO) << "SandboxedProcessService: Exiting sandboxed process.";
-  // TODO(tedchoc): These methods should also be in the content namespace to
-  // avoid specifying it in the LibraryLoaderExitHook call.
-  content::LibraryLoaderExitHook();
+  LibraryLoaderExitHook();
   _exit(0);
 }
 
-namespace content {
-
 bool RegisterSandboxedProcessService(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
diff --git a/content/browser/android/web_settings.cc b/content/browser/android/web_settings.cc
index 71a09a46..c4251e8 100644
--- a/content/browser/android/web_settings.cc
+++ b/content/browser/android/web_settings.cc
@@ -10,16 +10,11 @@
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/public/browser/web_contents.h"
+#include "jni/web_settings_jni.h"
 #include "webkit/glue/user_agent.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
 
-// TODO(tedchoc): Remove once the JNI generator has been updated to allow
-// namespace specification.
-namespace content {
-#include "jni/web_settings_jni.h"
-}
-
 using base::android::CheckException;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertUTF16ToJavaString;
@@ -95,9 +90,9 @@ struct WebSettings::FieldIds {
 
 WebSettings::WebSettings(JNIEnv* env,
                          jobject obj,
-                         content::WebContents* contents,
+                         WebContents* contents,
                          bool is_master_mode)
-    : content::WebContentsObserver(contents),
+    : WebContentsObserver(contents),
       is_master_mode_(is_master_mode) {
   web_settings_.Reset(env, obj);
 }
@@ -117,13 +112,11 @@ void WebSettings::Destroy(JNIEnv* env, jobject obj) {
 void WebSettings::SyncFromNativeImpl() {
   JNIEnv* env = base::android::AttachCurrentThread();
   CHECK(env);
-  if (!field_ids_.get()) {
+  if (!field_ids_.get())
     field_ids_.reset(new FieldIds(env));
-  }
 
   jobject obj = web_settings_.obj();
-  content::RenderViewHost* render_view_host =
-      web_contents()->GetRenderViewHost();
+  RenderViewHost* render_view_host = web_contents()->GetRenderViewHost();
   WebPreferences prefs = render_view_host->GetDelegate()->GetWebkitPrefs();
 
   ScopedJavaLocalRef<jstring> str =
@@ -204,13 +197,11 @@ void WebSettings::SyncFromNativeImpl() {
 void WebSettings::SyncToNativeImpl() {
   JNIEnv* env = base::android::AttachCurrentThread();
   CHECK(env);
-  if (!field_ids_.get()) {
+  if (!field_ids_.get())
     field_ids_.reset(new FieldIds(env));
-  }
 
   jobject obj = web_settings_.obj();
-  content::RenderViewHost* render_view_host =
-      web_contents()->GetRenderViewHost();
+  RenderViewHost* render_view_host = web_contents()->GetRenderViewHost();
   WebPreferences prefs = render_view_host->GetDelegate()->GetWebkitPrefs();
 
   ScopedJavaLocalRef<jstring> str(
@@ -288,24 +279,23 @@ void WebSettings::SyncToNative(JNIEnv* env, jobject obj) {
   SyncToNativeImpl();
 }
 
-void WebSettings::RenderViewCreated(content::RenderViewHost*) {
-  if (is_master_mode_) {
+void WebSettings::RenderViewCreated(RenderViewHost* render_view_host) {
+  if (is_master_mode_)
     SyncToNativeImpl();
-  }
 }
 
-static jint Init(
+jint Init(
     JNIEnv* env, jobject obj, jint nativeContentView,
     jboolean is_master_mode) {
-  content::WebContents* web_contents =
-      reinterpret_cast<content::ContentViewImpl*>(nativeContentView)
+  WebContents* web_contents =
+      reinterpret_cast<ContentViewImpl*>(nativeContentView)
           ->web_contents();
   WebSettings* web_settings =
       new WebSettings(env, obj, web_contents, is_master_mode);
   return reinterpret_cast<jint>(web_settings);
 }
 
-static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) {
+jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) {
   // "Version/4.0" had been hardcoded in the legacy WebView.
   std::string ua = webkit_glue::BuildUserAgentFromProduct("Version/4.0");
   return base::android::ConvertUTF8ToJavaString(env, ua).Release();
diff --git a/content/browser/android/web_settings.h b/content/browser/android/web_settings.h
index de8a3d7..b463396 100644
--- a/content/browser/android/web_settings.h
+++ b/content/browser/android/web_settings.h
@@ -37,7 +37,7 @@ class WebSettings : public WebContentsObserver {
   void SyncToNativeImpl();
 
   // WebContentsObserver overrides:
-  virtual void RenderViewCreated(RenderViewHost*) OVERRIDE;
+  virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
 
   // Determines whether a sync to native should be triggered when a new render
   // view is created.
diff --git a/content/public/android/java/org/chromium/content/app/SandboxedProcessService.java b/content/public/android/java/org/chromium/content/app/SandboxedProcessService.java
index 5bbb3bb..2a3c2bd 100644
--- a/content/public/android/java/org/chromium/content/app/SandboxedProcessService.java
+++ b/content/public/android/java/org/chromium/content/app/SandboxedProcessService.java
@@ -17,6 +17,7 @@ import android.util.Log;
 import android.view.Surface;
 
 import org.chromium.base.CalledByNative;
+import org.chromium.base.JNINamespace;
 import org.chromium.content.app.ContentMain;
 import org.chromium.content.browser.SandboxedProcessConnection;
 import org.chromium.content.common.ISandboxedProcessCallback;
@@ -33,6 +34,7 @@ import org.chromium.content.common.SurfaceCallback;
  *              android:process=":sandboxed_processX" />
  * for X in 0...N-1 (where N is {@link SandboxedProcessLauncher#MAX_REGISTERED_SERVICES})
  */
+@JNINamespace("content")
 public class SandboxedProcessService extends Service {
     private static final String MAIN_THREAD_NAME = "SandboxedProcessMain";
     private static final String TAG = "SandboxedProcessService";
diff --git a/content/public/android/java/org/chromium/content/browser/WebSettings.java b/content/public/android/java/org/chromium/content/browser/WebSettings.java
index 7650a15..10a2087 100644
--- a/content/public/android/java/org/chromium/content/browser/WebSettings.java
+++ b/content/public/android/java/org/chromium/content/browser/WebSettings.java
@@ -10,6 +10,7 @@ import android.webkit.WebSettings.PluginState;
 import android.webkit.WebView;
 
 import org.chromium.base.CalledByNative;
+import org.chromium.base.JNINamespace;
 import org.chromium.base.ThreadUtils;
 
 /**
@@ -18,6 +19,7 @@ import org.chromium.base.ThreadUtils;
  * ContentView.PERSONALITY_VIEW role, all settings are read / write. If ContentView
  * is in the ContentView.PERSONALITY_CHROME role, setting can only be read.
  */
+@JNINamespace("content")
 public class WebSettings {
     private static final String TAG = "WebSettings";