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

chrome/android/testshell/chrome_main_delegate_testshell_android.h

Index: chrome/android/testshell/chrome_main_delegate_testshell_android.h
diff --git a/chrome/android/testshell/chrome_main_delegate_testshell_android.h b/chrome/android/testshell/chrome_main_delegate_testshell_android.h
deleted file mode 100644
index d07782cc3aee5cd528dafd368b22744fd119d2d3..0000000000000000000000000000000000000000
--- a/chrome/android/testshell/chrome_main_delegate_testshell_android.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// 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.
-
-#ifndef CHROME_ANDROID_TESTSHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_
-#define CHROME_ANDROID_TESTSHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_
-
-#include "chrome/app/android/chrome_main_delegate_android.h"
-
-class ChromeMainDelegateTestShellAndroid : public ChromeMainDelegateAndroid {
- public:
-  ChromeMainDelegateTestShellAndroid();
-  virtual ~ChromeMainDelegateTestShellAndroid();
-
-  virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateTestShellAndroid);
-};
-
-#endif  // CHROME_ANDROID_TESTSHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_