chrome: Move ChromeBackupWatcher out of chrome namespace.

From discussion on chromium-dev, it was decided to remove 'chrome'
namespace.

Bug: 289619
Change-Id: I4b06495e341b6f75cce89d06f92a18fc4826cac1
Reviewed-on: https://chromium-review.googlesource.com/766088Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Anthony Berent <aberent@chromium.org>
Commit-Queue: srirama chandra sekhar <srirama.m@samsung.com>
Cr-Commit-Position: refs/heads/master@{#517804}

chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java

@@ -18,7 +18,7 @@ import org.chromium.components.signin.ChromeSigninController;
  * Class for watching for changes to the Android preferences that are backed up using Android
  * key/value backup.
  */
-@JNINamespace("chrome::android")
+@JNINamespace("android")
 public class ChromeBackupWatcher {
     private BackupManager mBackupManager;
 

chrome/browser/android/chrome_backup_agent.cc

@@ -46,8 +46,8 @@ const char* backed_up_preferences_[] = {
 static base::android::ScopedJavaLocalRef<jobjectArray> GetBoolBackupNames(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& jcaller) {
-  return base::android::ToJavaArrayOfStrings(
-      env, chrome::android::GetBackupPrefNames());
+  return base::android::ToJavaArrayOfStrings(env,
+                                             android::GetBackupPrefNames());
 }
 
 static base::android::ScopedJavaLocalRef<jbooleanArray> GetBoolBackupValues(
@@ -86,7 +86,6 @@ static void SetBoolBackupPrefs(
   prefs->CommitPendingWrite();
 }
 
-namespace chrome {
 namespace android {
 
 std::vector<std::string> GetBackupPrefNames() {
@@ -115,4 +114,3 @@ void SetBoolBackupPrefsForTesting(
 }
 
 }  //  namespace android
-}  //  namespace chrome

chrome/browser/android/chrome_backup_agent.h

@@ -10,7 +10,6 @@
 
 #include "base/android/jni_android.h"
 
-namespace chrome {
 namespace android {
 
 std::vector<std::string> GetBackupPrefNames();
@@ -29,6 +28,5 @@ void SetBoolBackupPrefsForTesting(
     const base::android::JavaParamRef<jbooleanArray>& values);
 
 }  //  namespace android
-}  //  namespace chrome
 
 #endif  // CHROME_BROWSER_ANDROID_CHROME_BACKUP_AGENT_H_

chrome/browser/android/chrome_backup_agent_unittest.cc

@@ -21,7 +21,6 @@
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace chrome {
 namespace android {
 
 using base::android::AppendJavaStringArrayToStringVector;
@@ -139,4 +138,3 @@ TEST_F(ChromeBackupAgentTest, SetBoolBackupValues) {
 }
 
 }  //  namespace android
-}  //  namespace chrome

chrome/browser/android/chrome_backup_watcher.cc

@@ -7,7 +7,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "jni/ChromeBackupWatcher_jni.h"
 
-namespace chrome {
 namespace android {
 
 namespace {
@@ -35,4 +34,3 @@ ChromeBackupWatcher::ChromeBackupWatcher(Profile* profile) {
 ChromeBackupWatcher::~ChromeBackupWatcher() {}
 
 }  //  namespace android
-}  //  namespace chrome

chrome/browser/android/chrome_backup_watcher.h

@@ -15,7 +15,6 @@
 
 class Profile;
 
-namespace chrome {
 namespace android {
 
 // Watch the preferences that we back up using Android Backup, so that we can
@@ -32,5 +31,4 @@ class ChromeBackupWatcher {
 };
 
 }  //  namespace android
-}  //  namespace chrome
 #endif  // CHROME_BROWSER_ANDROID_CHROME_BACKUP_WATCHER_H_

chrome/browser/chrome_browser_main_android.cc

@@ -94,7 +94,7 @@ void ChromeBrowserMainPartsAndroid::PostProfileInit() {
 
   // Start watching the preferences that need to be backed up backup using
   // Android backup, so that we create a new backup if they change.
-  backup_watcher_.reset(new chrome::android::ChromeBackupWatcher(profile()));
+  backup_watcher_.reset(new android::ChromeBackupWatcher(profile()));
 }
 
 void ChromeBrowserMainPartsAndroid::PreEarlyInitialization() {

chrome/browser/chrome_browser_main_android.h

@@ -26,7 +26,7 @@ class ChromeBrowserMainPartsAndroid : public ChromeBrowserMainParts {
 
  private:
   std::unique_ptr<base::MessageLoop> main_message_loop_;
-  std::unique_ptr<chrome::android::ChromeBackupWatcher> backup_watcher_;
+  std::unique_ptr<android::ChromeBackupWatcher> backup_watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsAndroid);
 };