Move Icons out of Extension class

chrome/browser/extensions/extension_protocols_unittest.cc

 // Copyright (c) 2012 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.
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/extensions/extension_protocols.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
+#include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/test/mock_resource_context.h"
 #include "content/public/test/test_browser_thread.h"
 #include "extensions/common/constants.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_status.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
-using extensions::Extension;
-using extensions::Manifest;
 
-namespace {
+namespace extensions {
 
 scoped_refptr<Extension> CreateTestExtension(const std::string& name,
                                              bool incognito_split_mode) {
   DictionaryValue manifest;
   manifest.SetString("name", name);
   manifest.SetString("version", "1");
   manifest.SetString("incognito", incognito_split_mode ? "split" : "spanning");
 
   base::FilePath path;
   EXPECT_TRUE(file_util::GetCurrentDirectory(&path));
@@ skipping 29 matching lines @@
   ExtensionProtocolTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         file_thread_(BrowserThread::FILE, &message_loop_),
         io_thread_(BrowserThread::IO, &message_loop_) {}
 
   virtual void SetUp() {
     extension_info_map_ = new ExtensionInfoMap();
     net::URLRequestContext* request_context =
         resource_context_.GetRequestContext();
     old_factory_ = request_context->job_factory();
+
+    ManifestHandler::Register(extension_manifest_keys::kIcons,
+                              make_linked_ptr(new IconsHandler));
   }
 
   virtual void TearDown() {
     net::URLRequestContext* request_context =
         resource_context_.GetRequestContext();
     request_context->set_job_factory(old_factory_);
   }
 
   void SetProtocolHandler(bool incognito) {
     net::URLRequestContext* request_context =
         resource_context_.GetRequestContext();
     job_factory_.SetProtocolHandler(
-        extensions::kExtensionScheme,
+        kExtensionScheme,
         CreateExtensionProtocolHandler(incognito, extension_info_map_));
     request_context->set_job_factory(&job_factory_);
   }
 
   void StartRequest(net::URLRequest* request,
                     ResourceType::Type resource_type) {
     content::ResourceRequestInfo::AllocateForTesting(request,
                                                      resource_type,
                                                      &resource_context_,
                                                      -1,
@@ skipping 107 matching lines @@
                                        extension_misc::UNLOAD_REASON_DISABLE);
   {
     net::URLRequest request(extension->GetResourceURL("webstore_icon_16.png"),
                             &test_delegate_,
                             resource_context_.GetRequestContext());
     StartRequest(&request, ResourceType::MEDIA);
     EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
   }
 }
 
-}  // namespace
+}  // namespace extensions