diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 23:38:22 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 23:38:22 +0000 |
| commit | e03604b93e09e919287a853d68e740c9e6f0fb9f (patch) | |
| tree | d86464635da2d96781cf48f9b8cbeca95638df7b /google_apis/google_api_keys.cc | |
| parent | 2ee2f5db813d4f9ac9c129c67c3fb2b3c01ae999 (diff) | |
| download | chromium_src-e03604b93e09e919287a853d68e740c9e6f0fb9f.zip chromium_src-e03604b93e09e919287a853d68e740c9e6f0fb9f.tar.gz chromium_src-e03604b93e09e919287a853d68e740c9e6f0fb9f.tar.bz2 | |
Avoid having two copies of implementation from google_api_keys.cc
This fixes a problem that was only happening with some linkers, where
the linker would choose the version of functions from
google_api_keys.cc that was defined in the google_api_keys_unittest.cc
file when that source file got #included at global scope. Thanks to
blundell@chromium.org for the report.
BUG=None
Review URL: https://chromiumcodereview.appspot.com/11819043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176207 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis/google_api_keys.cc')
| -rw-r--r-- | google_apis/google_api_keys.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/google_apis/google_api_keys.cc b/google_apis/google_api_keys.cc index 830a135..5b11247 100644 --- a/google_apis/google_api_keys.cc +++ b/google_apis/google_api_keys.cc @@ -4,6 +4,8 @@ #include "google_apis/google_api_keys.h" +// If you add more includes to this list, you also need to add them to +// google_api_keys_unittest.cc. #include "base/command_line.h" #include "base/environment.h" #include "base/lazy_instance.h" |