Misc cleanup in extension_registry_unittest.cc.

extensions/browser/extension_registry_unittest.cc

 // Copyright 2013 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 "extensions/browser/extension_registry.h"
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
-#include "base/strings/string_util.h"
 #include "extensions/browser/extension_registry_observer.h"
 #include "extensions/browser/uninstall_reason.h"
 #include "extensions/common/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 namespace {
 
 typedef testing::Test ExtensionRegistryTest;
 
 testing::AssertionResult HasSingleExtension(
     const ExtensionList& list,
     const scoped_refptr<const Extension>& extension) {
   if (list.empty())
     return testing::AssertionFailure() << "No extensions in list";
-  if (list.size() > 1)
+  if (list.size() > 1) {
     return testing::AssertionFailure() << list.size()
                                        << " extensions, expected 1";
+  }
   const Extension* did_load = list[0].get();
-  if (did_load != extension.get())
+  if (did_load != extension.get()) {
     return testing::AssertionFailure() << "Expected " << extension->id()
                                        << " found " << did_load->id();
+  }
   return testing::AssertionSuccess();
 }
 
 class TestObserver : public ExtensionRegistryObserver {
  public:
+  TestObserver() {}
+
   void Reset() {
     loaded_.clear();
     unloaded_.clear();
     installed_.clear();
     uninstalled_.clear();
   }
 
   const ExtensionList& loaded() { return loaded_; }
   const ExtensionList& unloaded() { return unloaded_; }
   const ExtensionList& installed() { return installed_; }
@@ skipping 24 matching lines @@
                               extensions::UninstallReason reason) override {
     uninstalled_.push_back(extension);
   }
 
   void OnShutdown(extensions::ExtensionRegistry* registry) override { Reset(); }
 
   ExtensionList loaded_;
   ExtensionList unloaded_;
   ExtensionList installed_;
   ExtensionList uninstalled_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestObserver);
 };
 
 TEST_F(ExtensionRegistryTest, FillAndClearRegistry) {
   ExtensionRegistry registry(NULL);
   scoped_refptr<Extension> extension1 = test_util::CreateEmptyExtension("id1");
   scoped_refptr<Extension> extension2 = test_util::CreateEmptyExtension("id2");
   scoped_refptr<Extension> extension3 = test_util::CreateEmptyExtension("id3");
   scoped_refptr<Extension> extension4 = test_util::CreateEmptyExtension("id4");
 
   // All the sets start empty.
@@ skipping 142 matching lines @@
   TestObserver observer;
   registry.AddObserver(&observer);
 
   EXPECT_TRUE(observer.loaded().empty());
   EXPECT_TRUE(observer.unloaded().empty());
   EXPECT_TRUE(observer.installed().empty());
 
   scoped_refptr<const Extension> extension =
       test_util::CreateEmptyExtension("id");
 
-  registry.TriggerOnWillBeInstalled(
-      extension.get(), false, false, base::EmptyString());
+  registry.TriggerOnWillBeInstalled(extension.get(), false, false,
+                                    std::string());
   EXPECT_TRUE(HasSingleExtension(observer.installed(), extension.get()));
 
   registry.AddEnabled(extension);
   registry.TriggerOnLoaded(extension.get());
 
   registry.TriggerOnWillBeInstalled(extension.get(), true, false, "foo");
 
   EXPECT_TRUE(HasSingleExtension(observer.loaded(), extension.get()));
   EXPECT_TRUE(observer.unloaded().empty());
   registry.Shutdown();
 
   registry.RemoveEnabled(extension->id());
   registry.TriggerOnUnloaded(extension.get(),
                              UnloadedExtensionInfo::REASON_DISABLE);
 
   EXPECT_TRUE(observer.loaded().empty());
   EXPECT_TRUE(HasSingleExtension(observer.unloaded(), extension.get()));
   registry.Shutdown();
 
-  registry.TriggerOnUninstalled(extension.get(),
-                                extensions::UNINSTALL_REASON_FOR_TESTING);
+  registry.TriggerOnUninstalled(extension.get(), UNINSTALL_REASON_FOR_TESTING);
   EXPECT_TRUE(observer.installed().empty());
   EXPECT_TRUE(HasSingleExtension(observer.uninstalled(), extension.get()));
 
   registry.RemoveObserver(&observer);
 }
 
 }  // namespace
 }  // namespace extensions