Move base/android/path_service.cc|h to path_service_android.cc|h

Gyp targets shouldn't contain source with identical basenames.

Fallout from http://src.chromium.org/viewvc/chrome?view=rev&revision=149842


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

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

base/android/base_jni_registrar.cc

@@ -10,7 +10,7 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/android/locale_utils.h"
-#include "base/android/path_service.h"
+#include "base/android/path_service_android.h"
 #include "base/android/path_utils.h"
 
 namespace base {

base/android/path_service.cc → base/android/path_service_android.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 "base/android/path_service.h"
+#include "base/android/path_service_android.h"
 
 #include "base/file_path.h"
 #include "base/path_service.h"

base/android/path_service.h → base/android/path_service_android.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_ANDROID_PATH_SERVICE_H_
-#define BASE_ANDROID_PATH_SERVICE_H_
+#ifndef BASE_ANDROID_PATH_SERVICE_ANDROID_H_
+#define BASE_ANDROID_PATH_SERVICE_ANDROID_H_
 
 #include <jni.h>
 
@@ -15,4 +15,4 @@ bool RegisterPathService(JNIEnv* env);
 }  // namespace android
 }  // namespace base
 
-#endif  // BASE_ANDROID_PATH_SERVICE_H_
+#endif  // BASE_ANDROID_PATH_SERVICE_ANDROID_H_

base/base.gypi

@@ -41,8 +41,8 @@
           'android/jni_string.h',
           'android/locale_utils.cc',
           'android/locale_utils.h',
-          'android/path_service.cc',
-          'android/path_service.h',
+          'android/path_service_android.cc',
+          'android/path_service_android.h',
           'android/path_utils.cc',
           'android/path_utils.h',
           'at_exit.cc',