summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_apitest.cc
diff options
context:
space:
mode:
authorvabr@chromium.org <vabr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-11 12:33:35 +0000
committervabr@chromium.org <vabr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-11 12:33:35 +0000
commitae54db1c1465c911b228ef10e82aea07bb012b11 (patch)
tree87e9851aa020e0f12b2dc98c09f0f4d6ccbddfbe /chrome/browser/extensions/extension_apitest.cc
parentc6d5f8cf61ab1a4d73d75d5bbaf3e81a5d9debe1 (diff)
downloadchromium_src-ae54db1c1465c911b228ef10e82aea07bb012b11.zip
chromium_src-ae54db1c1465c911b228ef10e82aea07bb012b11.tar.gz
chromium_src-ae54db1c1465c911b228ef10e82aea07bb012b11.tar.bz2
Moving test_api to api/test .
BUG=101244 TEST=N/A, only moving code, no change in functionality Review URL: https://chromiumcodereview.appspot.com/10690113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146107 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_apitest.cc')
-rw-r--r--chrome/browser/extensions/extension_apitest.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index 26241e7..4a8390d 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -7,7 +7,7 @@
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_test_api.h"
+#include "chrome/browser/extensions/api/test/test_api.h"
#include "chrome/browser/extensions/unpacked_installer.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile.h"
@@ -102,11 +102,12 @@ void ExtensionApiTest::SetUpInProcessBrowserTestFixture() {
test_config_.reset(new DictionaryValue());
test_config_->SetString(kTestDataDirectory,
net::FilePathToFileURL(test_data_dir_).spec());
- ExtensionTestGetConfigFunction::set_test_config_state(test_config_.get());
+ extensions::TestGetConfigFunction::set_test_config_state(
+ test_config_.get());
}
void ExtensionApiTest::TearDownInProcessBrowserTestFixture() {
- ExtensionTestGetConfigFunction::set_test_config_state(NULL);
+ extensions::TestGetConfigFunction::set_test_config_state(NULL);
test_config_.reset(NULL);
}