Index: chrome/browser/component_updater/test/component_updater_service_unittest.h |
diff --git a/chrome/browser/component_updater/test/component_updater_service_unittest.h b/chrome/browser/component_updater/test/component_updater_service_unittest.h |
index 1eaf7014e59c723ae0ebf9fc9279580850118431..d40bd05be11d20f2e89f6f8e40a0bf80454c9351 100644 |
--- a/chrome/browser/component_updater/test/component_updater_service_unittest.h |
+++ b/chrome/browser/component_updater/test/component_updater_service_unittest.h |
@@ -11,9 +11,9 @@ |
#include "base/compiler_specific.h" |
#include "base/files/file_path.h" |
#include "base/memory/scoped_ptr.h" |
-#include "chrome/browser/component_updater/test/test_configurator.h" |
-#include "chrome/browser/component_updater/test/url_request_post_interceptor.h" |
#include "components/component_updater/component_updater_service.h" |
+#include "components/component_updater/test/test_configurator.h" |
+#include "components/component_updater/test/url_request_post_interceptor.h" |
#include "content/public/test/test_browser_thread_bundle.h" |
#include "content/test/net/url_request_prepackaged_interceptor.h" |
#include "net/url_request/url_request_test_util.h" |
@@ -27,48 +27,6 @@ class TestInstaller; |
// Intercepts HTTP GET requests sent to "localhost". |
typedef content::URLLocalHostRequestPrepackagedInterceptor GetInterceptor; |
-// Intercepts HTTP POST requests sent to "localhost2". |
-class InterceptorFactory : public URLRequestPostInterceptorFactory { |
- public: |
- InterceptorFactory(); |
- ~InterceptorFactory(); |
- |
- URLRequestPostInterceptor* CreateInterceptor(); |
- |
- private: |
- DISALLOW_COPY_AND_ASSIGN(InterceptorFactory); |
-}; |
- |
-class PartialMatch : public URLRequestPostInterceptor::RequestMatcher { |
- public: |
- explicit PartialMatch(const std::string& expected) : expected_(expected) {} |
- virtual bool Match(const std::string& actual) const OVERRIDE; |
- |
- private: |
- const std::string expected_; |
- |
- DISALLOW_COPY_AND_ASSIGN(PartialMatch); |
-}; |
- |
-// component 1 has extension id "jebgalgnebhfojomionfpkfelancnnkf", and |
-// the RSA public key the following hash: |
-const uint8 jebg_hash[] = {0x94, 0x16, 0x0b, 0x6d, 0x41, 0x75, 0xe9, 0xec, |
- 0x8e, 0xd5, 0xfa, 0x54, 0xb0, 0xd2, 0xdd, 0xa5, |
- 0x6e, 0x05, 0x6b, 0xe8, 0x73, 0x47, 0xf6, 0xc4, |
- 0x11, 0x9f, 0xbc, 0xb3, 0x09, 0xb3, 0x5b, 0x40}; |
-// component 2 has extension id "abagagagagagagagagagagagagagagag", and |
-// the RSA public key the following hash: |
-const uint8 abag_hash[] = {0x01, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, |
- 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, |
- 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, |
- 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x01}; |
-// component 3 has extension id "ihfokbkgjpifnbbojhneepfflplebdkc", and |
-// the RSA public key the following hash: |
-const uint8 ihfo_hash[] = {0x87, 0x5e, 0xa1, 0xa6, 0x9f, 0x85, 0xd1, 0x1e, |
- 0x97, 0xd4, 0x4f, 0x55, 0xbf, 0xb4, 0x13, 0xa2, |
- 0xe7, 0xc5, 0xc8, 0xf5, 0x60, 0x19, 0x78, 0x1b, |
- 0x6d, 0xe9, 0x4c, 0xeb, 0x96, 0x05, 0x42, 0x17}; |
- |
class ComponentUpdaterTest : public testing::Test { |
public: |
enum TestComponents { |
@@ -108,7 +66,6 @@ class ComponentUpdaterTest : public testing::Test { |
private: |
TestConfigurator* test_config_; |
- base::FilePath test_data_dir_; |
content::TestBrowserThreadBundle thread_bundle_; |
scoped_ptr<ComponentUpdateService> component_updater_; |
}; |