diff options
| author | marshall@chromium.org <marshall@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 16:48:52 +0000 |
|---|---|---|
| committer | marshall@chromium.org <marshall@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 16:48:52 +0000 |
| commit | b1b33e512d3297f38d65833054ad9cf6a8408df7 (patch) | |
| tree | c913e2573c3d543492fd0cb9e609e1154813411a /content/test/content_test_launcher.cc | |
| parent | 1ab5b8cd4565b2e8d1f0282e09170d46dfd2b98d (diff) | |
| download | chromium_src-b1b33e512d3297f38d65833054ad9cf6a8408df7.zip chromium_src-b1b33e512d3297f38d65833054ad9cf6a8408df7.tar.gz chromium_src-b1b33e512d3297f38d65833054ad9cf6a8408df7.tar.bz2 | |
Revert 121236 - Support sharing of ContentMain and BrowserMain code with embedded use cases (try #2).
Tests failing.
Review URL: https://chromiumcodereview.appspot.com/9372027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121245 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" |