Moved ExtensionMessage* into extensions namespace

chrome/common/extensions/extension_localization_peer_unittest.cc

 // Copyright (c) 2011 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 <map>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/common/extensions/extension_message_bundle.h"
 #include "chrome/common/extensions/extension_localization_peer.h"
+#include "chrome/common/extensions/message_bundle.h"
 #include "ipc/ipc_sender.h"
 #include "ipc/ipc_sync_message.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/resource_loader_bridge.h"
 
 using testing::_;
 using testing::DoAll;
@@ skipping 172 matching lines @@
       CreateExtensionLocalizationPeer("text/css", GURL(kExtensionUrl_1));
   SetData(filter_peer, "some text");
   filter_peer->OnCompletedRequest(status, "", base::TimeTicks());
 }
 
 TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestWithCatalogs) {
   // It will self-delete once it exits OnCompletedRequest.
   ExtensionLocalizationPeer* filter_peer =
       CreateExtensionLocalizationPeer("text/css", GURL(kExtensionUrl_2));
 
-  L10nMessagesMap messages;
+  extensions::L10nMessagesMap messages;
   messages.insert(std::make_pair("text", "new text"));
-  ExtensionToL10nMessagesMap& l10n_messages_map =
-      *GetExtensionToL10nMessagesMap();
+  extensions::ExtensionToL10nMessagesMap& l10n_messages_map =
+      *extensions::GetExtensionToL10nMessagesMap();
   l10n_messages_map["some_id2"] = messages;
 
   SetData(filter_peer, "some __MSG_text__");
 
   // We already have messages in memory, Send will be skipped.
   EXPECT_CALL(*sender_, Send(_)).Times(0);
 
   // __MSG_text__ gets replaced with "new text".
   std::string data("some new text");
   EXPECT_CALL(*original_peer_,
               OnReceivedData(StrEq(data.data()), data.length(), -1));
 
   EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
   EXPECT_CALL(*original_peer_, OnCompletedRequest(
       IsURLRequestEqual(net::URLRequestStatus::SUCCESS), "",
       base::TimeTicks()));
 
   net::URLRequestStatus status;
   status.set_status(net::URLRequestStatus::SUCCESS);
   filter_peer->OnCompletedRequest(status, "", base::TimeTicks());
 }
 
 TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestReplaceMessagesFails) {
   // It will self-delete once it exits OnCompletedRequest.
   ExtensionLocalizationPeer* filter_peer =
       CreateExtensionLocalizationPeer("text/css", GURL(kExtensionUrl_3));
 
-  L10nMessagesMap messages;
+  extensions::L10nMessagesMap messages;
   messages.insert(std::make_pair("text", "new text"));
-  ExtensionToL10nMessagesMap& l10n_messages_map =
-      *GetExtensionToL10nMessagesMap();
+  extensions::ExtensionToL10nMessagesMap& l10n_messages_map =
+      *extensions::GetExtensionToL10nMessagesMap();
   l10n_messages_map["some_id3"] = messages;
 
   std::string message("some __MSG_missing_message__");
   SetData(filter_peer, message);
 
   // We already have messages in memory, Send will be skipped.
   EXPECT_CALL(*sender_, Send(_)).Times(0);
 
   // __MSG_missing_message__ is missing, so message stays the same.
   EXPECT_CALL(*original_peer_,
               OnReceivedData(StrEq(message.data()), message.length(), -1));
 
   EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
   EXPECT_CALL(*original_peer_, OnCompletedRequest(
       IsURLRequestEqual(net::URLRequestStatus::SUCCESS), "",
       base::TimeTicks()));
 
   net::URLRequestStatus status;
   status.set_status(net::URLRequestStatus::SUCCESS);
   filter_peer->OnCompletedRequest(status, "", base::TimeTicks());
 }