Support sharing of ContentMain and BrowserMain code with embedded use cases (try #2).

content/test/content_test_launcher.cc

Index: content/test/content_test_launcher.cc
===================================================================
--- content/test/content_test_launcher.cc	(revision 120581)
+++ content/test/content_test_launcher.cc	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -10,7 +10,7 @@
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/test/test_suite.h"
-#include "content/app/content_main.h"
+#include "content/public/app/content_main.h"
 #include "content/public/common/content_switches.h"
 #include "content/shell/shell_main_delegate.h"