diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-06 18:46:35 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-06 18:46:35 +0000 |
| commit | 9e49959b0e6e940c39359f5f05f9d5da6032a869 (patch) | |
| tree | a1059820b0bf8129bcf571966891ce122453465e /content/test/content_test_launcher.cc | |
| parent | 4a8e0f3d4b33c1b69021575d7b971da7b17340ae (diff) | |
| download | chromium_src-9e49959b0e6e940c39359f5f05f9d5da6032a869.zip chromium_src-9e49959b0e6e940c39359f5f05f9d5da6032a869.tar.gz chromium_src-9e49959b0e6e940c39359f5f05f9d5da6032a869.tar.bz2 | |
Revert "Support sharing of ContentMain and BrowserMain code with embedded use cases."
This reverts commit r120574. Test failures.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/content_test_launcher.cc')
| -rw-r--r-- | content/test/content_test_launcher.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc index b646f3e..f2cd5a3 100644 --- a/content/test/content_test_launcher.cc +++ b/content/test/content_test_launcher.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// 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. @@ -10,7 +10,7 @@ #include "base/path_service.h" #include "base/scoped_temp_dir.h" #include "base/test/test_suite.h" -#include "content/public/app/content_main.h" +#include "content/app/content_main.h" #include "content/public/common/content_switches.h" #include "content/shell/shell_main_delegate.h" |