Moved ExternalExtensionLoaders/Providers into extensions namespace

chrome/browser/extensions/external_policy_loader_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/logging.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "base/version.h"
-#include "chrome/browser/extensions/external_extension_provider_impl.h"
-#include "chrome/browser/extensions/external_extension_provider_interface.h"
-#include "chrome/browser/extensions/external_policy_extension_loader.h"
+#include "chrome/browser/extensions/external_provider_impl.h"
+#include "chrome/browser/extensions/external_provider_interface.h"
+#include "chrome/browser/extensions/external_policy_loader.h"

[Joao da Silva, 2012/07/13 13:33:42]

Nit: order

[Devlin, 2012/07/13 16:31:17]

Done.

 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
-using extensions::Extension;
 
-class ExternalPolicyExtensionProviderTest : public testing::Test {
+namespace extensions {
+
+class ExternalPolicyProviderTest : public testing::Test {
  public:
-  ExternalPolicyExtensionProviderTest()
+  ExternalPolicyProviderTest()
       : loop_(MessageLoop::TYPE_IO),
         ui_thread_(BrowserThread::UI, &loop_) {
   }
 
-  virtual ~ExternalPolicyExtensionProviderTest() {}
+  virtual ~ExternalPolicyProviderTest() {}
 
  private:
   // We need these to satisfy BrowserThread::CurrentlyOn(BrowserThread::UI)
-  // checks in ExternalExtensionProviderImpl.
+  // checks in ExternalProviderImpl.
   MessageLoop loop_;
   content::TestBrowserThread ui_thread_;
 };
 
-class MockExternalPolicyExtensionProviderVisitor
-    : public ExternalExtensionProviderInterface::VisitorInterface {
+class MockExternalPolicyProviderVisitor
+    : public ExternalProviderInterface::VisitorInterface {
  public:
-  MockExternalPolicyExtensionProviderVisitor() {
+  MockExternalPolicyProviderVisitor() {
   }
 
   // Initialize a provider with |policy_forcelist|, and check that it parses
   // exactly those extensions, that are specified in |policy_validlist|.
   void Visit(ListValue* policy_forcelist,
              ListValue* policy_validlist,
              const std::set<std::string>& ignore_list) {
     profile_.reset(new TestingProfile);
     profile_->GetTestingPrefService()->SetManagedPref(
         prefs::kExtensionInstallForceList,
         policy_forcelist->DeepCopy());
-    provider_.reset(new ExternalExtensionProviderImpl(
+    provider_.reset(new ExternalProviderImpl(
         this,
-        new ExternalPolicyExtensionLoader(profile_.get()),
+        new ExternalPolicyLoader(profile_.get()),
         Extension::INVALID,
         Extension::EXTERNAL_POLICY_DOWNLOAD,
         Extension::NO_FLAGS));
 
     // Extensions will be removed from this list as they visited,
     // so it should be emptied by the end.
     remaining_extensions = policy_validlist;
     provider_->VisitRegisteredExtension();
     EXPECT_EQ(0u, remaining_extensions->GetSize());
   }
@@ skipping 21 matching lines @@
     EXPECT_EQ(Extension::EXTERNAL_POLICY_DOWNLOAD, location1);
     EXPECT_FALSE(version1.get());
 
     // Remove the extension from our list.
     StringValue ext_str(id + ";" + update_url.spec());
     EXPECT_NE(false, remaining_extensions->Remove(ext_str, NULL));
     return true;
   }
 
   virtual void OnExternalProviderReady(
-      const ExternalExtensionProviderInterface* provider) {
+      const ExternalProviderInterface* provider) {
     EXPECT_EQ(provider, provider_.get());
     EXPECT_TRUE(provider->IsReady());
   }
 
  private:
   ListValue* remaining_extensions;
 
   scoped_ptr<TestingProfile> profile_;
 
-  scoped_ptr<ExternalExtensionProviderImpl> provider_;
+  scoped_ptr<ExternalProviderImpl> provider_;
 
-  DISALLOW_COPY_AND_ASSIGN(MockExternalPolicyExtensionProviderVisitor);
+  DISALLOW_COPY_AND_ASSIGN(MockExternalPolicyProviderVisitor);
 };
 
-TEST_F(ExternalPolicyExtensionProviderTest, PolicyIsParsed) {
+TEST_F(ExternalPolicyProviderTest, PolicyIsParsed) {
   ListValue forced_extensions;
   forced_extensions.Append(Value::CreateStringValue(
       "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;http://www.example.com/crx?a=5;b=6"));
   forced_extensions.Append(Value::CreateStringValue(
       "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;"
       "https://clients2.google.com/service/update2/crx"));
 
-  MockExternalPolicyExtensionProviderVisitor mv;
+  MockExternalPolicyProviderVisitor mv;
   std::set<std::string> empty;
   mv.Visit(&forced_extensions, &forced_extensions, empty);
 }
 
-TEST_F(ExternalPolicyExtensionProviderTest, InvalidPolicyIsNotParsed) {
+TEST_F(ExternalPolicyProviderTest, InvalidPolicyIsNotParsed) {
   ListValue forced_extensions, valid_extensions;
   StringValue valid(
       "cccccccccccccccccccccccccccccccc;http://www.example.com/crx");
   valid_extensions.Append(valid.DeepCopy());
   forced_extensions.Append(valid.DeepCopy());
   // Add invalid strings:
   forced_extensions.Append(Value::CreateStringValue(""));
   forced_extensions.Append(Value::CreateStringValue(";"));
   forced_extensions.Append(Value::CreateStringValue(";;"));
   forced_extensions.Append(Value::CreateStringValue(
       ";http://www.example.com/crx"));
   forced_extensions.Append(Value::CreateStringValue(
       ";aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
   forced_extensions.Append(Value::CreateStringValue(
       "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;"));
   forced_extensions.Append(Value::CreateStringValue(
       "http://www.example.com/crx;aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
   forced_extensions.Append(Value::CreateStringValue(
       "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;http#//www.example.com/crx"));
   forced_extensions.Append(Value::CreateStringValue(
       "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
   forced_extensions.Append(Value::CreateStringValue(
       "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahttp#//www.example.com/crx"));
 
-  MockExternalPolicyExtensionProviderVisitor mv;
+  MockExternalPolicyProviderVisitor mv;
   std::set<std::string> empty;
   mv.Visit(&forced_extensions, &valid_extensions, empty);
 }
+
+}  // namespace extensions