[Android] Move the java content/ package to content_public/ to start the split.

content/app/android/child_process_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/app/android/child_process_service.h"
 
 #include <android/native_window_jni.h>
 #include <cpu-features.h>
 
 #include "base/android/jni_array.h"
@@ skipping 14 matching lines @@
 using base::android::JavaIntArrayToIntVector;
 
 namespace content {
 
 namespace {
 
 class SurfaceTexturePeerChildImpl : public content::SurfaceTexturePeer,
                                     public content::GpuSurfaceLookup {
  public:
   // |service| is the instance of
-  // org.chromium.content.app.ChildProcessService.
+  // org.chromium.content_public.app.ChildProcessService.
   explicit SurfaceTexturePeerChildImpl(
       const base::android::ScopedJavaLocalRef<jobject>& service)
       : service_(service) {
     GpuSurfaceLookup::InitInstance(this);
   }
 
   virtual ~SurfaceTexturePeerChildImpl() {
     GpuSurfaceLookup::InitInstance(NULL);
   }
 
@@ skipping 19 matching lines @@
     if (surface.j_surface().is_null())
       return NULL;
 
     ANativeWindow* native_window = ANativeWindow_fromSurface(
         env, surface.j_surface().obj());
 
     return native_window;
   }
 
  private:
-  // The instance of org.chromium.content.app.ChildProcessService.
+  // The instance of org.chromium.content_public.app.ChildProcessService.
   base::android::ScopedJavaGlobalRef<jobject> service_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceTexturePeerChildImpl);
 };
 
 // Chrome actually uses the renderer code path for all of its child
 // processes such as renderers, plugins, etc.
 void InternalInitChildProcess(const std::vector<int>& file_ids,
                               const std::vector<int>& file_fds,
                               JNIEnv* env,
@@ skipping 47 matching lines @@
 
 bool RegisterChildProcessService(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void ShutdownMainThread(JNIEnv* env, jobject obj) {
   ChildThread::ShutdownThread();
 }
 
 }  // namespace content