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

chrome/android/shell/chrome_main_delegate_testshell_android.h

Index: chrome/android/shell/chrome_main_delegate_testshell_android.h
diff --git a/chrome/android/testshell/chrome_main_delegate_testshell_android.h b/chrome/android/shell/chrome_main_delegate_testshell_android.h
similarity index 70%
rename from chrome/android/testshell/chrome_main_delegate_testshell_android.h
rename to chrome/android/shell/chrome_main_delegate_testshell_android.h
index d07782cc3aee5cd528dafd368b22744fd119d2d3..94979c7a499b06ab6566a966518871f6df4d40fb 100644
--- a/chrome/android/testshell/chrome_main_delegate_testshell_android.h
+++ b/chrome/android/shell/chrome_main_delegate_testshell_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 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_