Revert "Revert 155950 - Add initial Chromium TestShell support for Android"

chrome/app/chrome_main_delegate.h

 // Copyright (c) 2011 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_APP_CHROME_MAIN_DELEGATE_H_
 #define CHROME_APP_CHROME_MAIN_DELEGATE_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/stats_counters.h"
 #include "chrome/common/chrome_content_client.h"
 #include "content/public/app/content_main_delegate.h"
 
 // Chrome implementation of ContentMainDelegate.
 class ChromeMainDelegate : public content::ContentMainDelegate {
  public:
   ChromeMainDelegate();
   virtual ~ChromeMainDelegate();
 
- private:
+ protected:
   // content::ContentMainDelegate implementation:
   virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
   virtual void PreSandboxStartup() OVERRIDE;
   virtual void SandboxInitialized(const std::string& process_type) OVERRIDE;
   virtual int RunProcess(
       const std::string& process_type,
       const content::MainFunctionParams& main_function_params) OVERRIDE;
   virtual void ProcessExiting(const std::string& process_type) OVERRIDE;
 #if defined(OS_MACOSX)
   virtual bool ProcessRegistersWithSystemProcess(
@@ skipping 16 matching lines @@
                             const std::string& process_type);
 #endif  // defined(OS_MACOSX)
 
   chrome::ChromeContentClient chrome_content_client_;
   scoped_ptr<base::StatsScope<base::StatsCounterTimer> > startup_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegate);
 };
 
 #endif  // CHROME_APP_CHROME_MAIN_DELEGATE_H_