summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-26 18:26:22 +0000
committeryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-26 18:26:22 +0000
commit40bc280e166cf8b948d8016538f89d2691c87196 (patch)
treeba46a5a32ca76a498b69e3efbd7b83075630c5c6
parent03b640fd591ce98a81ec36ef6dab245fa95b6b51 (diff)
downloadchromium_src-40bc280e166cf8b948d8016538f89d2691c87196.zip
chromium_src-40bc280e166cf8b948d8016538f89d2691c87196.tar.gz
chromium_src-40bc280e166cf8b948d8016538f89d2691c87196.tar.bz2
Move the app_shell_browsertests DNS apitest to chrome/browser/api/dns.
BUG=388893 Review URL: https://codereview.chromium.org/413353003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285775 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--extensions/browser/api/dns/dns_apitest.cc (renamed from extensions/shell/browser/dns_apitest.cc)0
-rw-r--r--extensions/shell/app_shell.gyp4
2 files changed, 3 insertions, 1 deletions
diff --git a/extensions/shell/browser/dns_apitest.cc b/extensions/browser/api/dns/dns_apitest.cc
index fa2ec2f..fa2ec2f 100644
--- a/extensions/shell/browser/dns_apitest.cc
+++ b/extensions/browser/api/dns/dns_apitest.cc
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp
index 1dd20bd..833d079 100644
--- a/extensions/shell/app_shell.gyp
+++ b/extensions/shell/app_shell.gyp
@@ -212,7 +212,9 @@
],
'sources': [
# TODO(yoz): Refactor once we have a second test target.
- 'browser/dns_apitest.cc',
+ # TODO(yoz): Something is off here; should this .gyp file be
+ # in the parent directory? Test target extensions_browsertests?
+ '../browser/api/dns/dns_apitest.cc',
'browser/shell_browsertest.cc',
'test/shell_test.h',
'test/shell_test.cc',