Move ChromeShell files from chrome/android/testshell to chrome/android/shell.

BUG=348137
NOTRY=true

Review URL: https://codereview.chromium.org/186843002

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

25 files changed, 13 insertions, 13 deletions

diff --git a/chrome/android/testshell/DEPS b/chrome/android/shell/DEPS
index a332a40..a332a40 100644
--- a/chrome/android/testshell/DEPS
+++ b/chrome/android/shell/DEPS
diff --git a/chrome/android/testshell/chrome_main_delegate_testshell_android.cc b/chrome/android/shell/chrome_main_delegate_testshell_android.cc
index ac2b508..c0b11d9 100644
--- a/chrome/android/testshell/chrome_main_delegate_testshell_android.cc
+++ b/chrome/android/shell/chrome_main_delegate_testshell_android.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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 "chrome/android/testshell/chrome_main_delegate_testshell_android.h"
+#include "chrome/android/shell/chrome_main_delegate_testshell_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
diff --git a/chrome/android/testshell/chrome_main_delegate_testshell_android.h b/chrome/android/shell/chrome_main_delegate_testshell_android.h
index d07782c..1e98606 100644
--- a/chrome/android/testshell/chrome_main_delegate_testshell_android.h
+++ b/chrome/android/shell/chrome_main_delegate_testshell_android.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-#ifndef CHROME_ANDROID_TESTSHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_
-#define CHROME_ANDROID_TESTSHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_
+#ifndef CHROME_ANDROID_SHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_
+#define CHROME_ANDROID_SHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_
 
 #include "chrome/app/android/chrome_main_delegate_android.h"
 
@@ -18,4 +18,4 @@ class ChromeMainDelegateTestShellAndroid : public ChromeMainDelegateAndroid {
   DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateTestShellAndroid);
 };
 
-#endif  // CHROME_ANDROID_TESTSHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_
+#endif  // CHROME_ANDROID_SHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_
diff --git a/chrome/android/testshell/java/AndroidManifest.xml b/chrome/android/shell/java/AndroidManifest.xml
index e07225e..6c7945d 100644
--- a/chrome/android/testshell/java/AndroidManifest.xml
+++ b/chrome/android/shell/java/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved.
+<!-- Copyright 2014 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.
diff --git a/chrome/android/testshell/java/DEPS b/chrome/android/shell/java/DEPS
index 0d019e1..0d019e1 100644
--- a/chrome/android/testshell/java/DEPS
+++ b/chrome/android/shell/java/DEPS
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
index 64ac189..64ac189 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java
index fb8d596..fb8d596 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplication.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromeShellApplicationObserver.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplicationObserver.java
index 25aae36..25aae36 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/shell/ChromeShellApplicationObserver.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellApplicationObserver.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/shell/MenuHandler.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/MenuHandler.java
index 6db23ec..6db23ec 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/shell/MenuHandler.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/MenuHandler.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/shell/TabManager.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/TabManager.java
index 9f4adc3..9f4adc3 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/shell/TabManager.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/TabManager.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/shell/TestShellPKCS11AuthenticationManager.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/TestShellPKCS11AuthenticationManager.java
index bd77503..bd77503 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/shell/TestShellPKCS11AuthenticationManager.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/TestShellPKCS11AuthenticationManager.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/shell/TestShellTab.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/TestShellTab.java
index 3c24f42..3c24f42 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/shell/TestShellTab.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/TestShellTab.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/shell/TestShellToolbar.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/TestShellToolbar.java
index 6c79b16..6c79b16 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/shell/TestShellToolbar.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/TestShellToolbar.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/shell/signin/AccountsChangedReceiver.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/signin/AccountsChangedReceiver.java
index 21fd956..21fd956 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/shell/signin/AccountsChangedReceiver.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/signin/AccountsChangedReceiver.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/shell/sync/AccountChooserFragment.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/sync/AccountChooserFragment.java
index deff905..deff905 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/shell/sync/AccountChooserFragment.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/sync/AccountChooserFragment.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/shell/sync/ChromeShellSyncAdapter.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/sync/ChromeShellSyncAdapter.java
index 1a22666..1a22666 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/shell/sync/ChromeShellSyncAdapter.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/sync/ChromeShellSyncAdapter.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/shell/sync/ChromeShellSyncAdapterService.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/sync/ChromeShellSyncAdapterService.java
index c57e543..c57e543 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/shell/sync/ChromeShellSyncAdapterService.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/sync/ChromeShellSyncAdapterService.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/shell/sync/SignoutFragment.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/sync/SignoutFragment.java
index 6a5f4c5..6a5f4c5 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/shell/sync/SignoutFragment.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/sync/SignoutFragment.java
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/shell/sync/SyncController.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/sync/SyncController.java
index dd895de..dd895de 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/shell/sync/SyncController.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/sync/SyncController.java
diff --git a/chrome/android/testshell/javatests/AndroidManifest.xml b/chrome/android/shell/javatests/AndroidManifest.xml
index 2b1473c..2b1473c 100644
--- a/chrome/android/testshell/javatests/AndroidManifest.xml
+++ b/chrome/android/shell/javatests/AndroidManifest.xml
diff --git a/chrome/android/testshell/javatests/OWNERS b/chrome/android/shell/javatests/OWNERS
index cfc5e65..cfc5e65 100644
--- a/chrome/android/testshell/javatests/OWNERS
+++ b/chrome/android/shell/javatests/OWNERS
diff --git a/chrome/android/testshell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java b/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java
index 2630d97..2630d97 100644
--- a/chrome/android/testshell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java
+++ b/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellTestBase.java
diff --git a/chrome/android/testshell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java b/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java
index 7dd0eb4..7dd0eb4 100644
--- a/chrome/android/testshell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java
+++ b/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java
diff --git a/chrome/android/testshell/testshell_google_location_settings_helper.cc b/chrome/android/shell/testshell_google_location_settings_helper.cc
index f109d55..8dd4ace 100644
--- a/chrome/android/testshell/testshell_google_location_settings_helper.cc
+++ b/chrome/android/shell/testshell_google_location_settings_helper.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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 "chrome/android/testshell/testshell_google_location_settings_helper.h"
+#include "chrome/android/shell/testshell_google_location_settings_helper.h"
 
 // Factory function
 GoogleLocationSettingsHelper* GoogleLocationSettingsHelper::Create() {
diff --git a/chrome/android/testshell/testshell_google_location_settings_helper.h b/chrome/android/shell/testshell_google_location_settings_helper.h
index f7c6221..cbb0afe 100644
--- a/chrome/android/testshell/testshell_google_location_settings_helper.h
+++ b/chrome/android/shell/testshell_google_location_settings_helper.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-#ifndef CHROME_ANDROID_TESTSHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_
-#define CHROME_ANDROID_TESTSHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_
+#ifndef CHROME_ANDROID_SHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_
+#define CHROME_ANDROID_SHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_
 
 #include "chrome/browser/android/google_location_settings_helper.h"
 
@@ -28,4 +28,4 @@ class TestShellGoogleLocationSettingsHelper
   DISALLOW_COPY_AND_ASSIGN(TestShellGoogleLocationSettingsHelper);
 };
 
-#endif  // CHROME_ANDROID_TESTSHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_
+#endif  // CHROME_ANDROID_SHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_