Componentize VersionInfo.

chrome/browser/extensions/api/declarative/rules_registry_with_cache_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 "extensions/browser/api/declarative/rules_registry.h"
 
 // Here we test the TestRulesRegistry which is the simplest possible
 // implementation of RulesRegistryWithCache as a proxy for
 // RulesRegistryWithCache.
 
@@ skipping 188 matching lines @@
   EXPECT_EQ("", AddRule(extension1_->id(), kRuleId));
   EXPECT_EQ("", AddRule(extension1_->id(), kRule2Id));
   EXPECT_EQ("", AddRule(extension2_->id(), kRuleId));
 
   // Check that we get the correct rules.
   std::vector<linked_ptr<api::events::Rule>> gotten_rules;
   registry_->GetAllRules(extension1_->id(), &gotten_rules);
   EXPECT_EQ(2u, gotten_rules.size());
   ASSERT_TRUE(gotten_rules[0]->id.get());
   ASSERT_TRUE(gotten_rules[1]->id.get());
-  EXPECT_TRUE( (kRuleId == *(gotten_rules[0]->id) &&
-                kRule2Id == *(gotten_rules[1]->id)) ||
-               (kRuleId == *(gotten_rules[1]->id) &&
-                kRule2Id == *(gotten_rules[0]->id)) );
+  EXPECT_TRUE((kRuleId == *(gotten_rules[0]->id) &&
+               kRule2Id == *(gotten_rules[1]->id)) ||
+              (kRuleId == *(gotten_rules[1]->id) &&
+               kRule2Id == *(gotten_rules[0]->id)) );
 }
 
 TEST_F(RulesRegistryWithCacheTest, OnExtensionUninstalled) {
   // Prime registry.
   EXPECT_EQ("", AddRule(extension1_->id(), kRuleId));
   EXPECT_EQ("", AddRule(extension2_->id(), kRuleId));
 
   // Check that the correct rules are removed.
   registry_->OnExtensionUninstalled(extension1_.get());
   EXPECT_EQ(0, GetNumberOfRules(extension1_->id()));
@@ skipping 98 matching lines @@
   EXPECT_FALSE(cache_delegate1->GetDeclarativeRulesStored(extension1_->id()));
   EXPECT_TRUE(cache_delegate2->GetDeclarativeRulesStored(extension1_->id()));
 }
 
 TEST_F(RulesRegistryWithCacheTest, RulesPreservedAcrossRestart) {
   // This test makes sure that rules are restored from the rule store
   // on registry (in particular, browser) restart.
 
   // TODO(vabr): Once some API using declarative rules enters the stable
   // channel, make sure to use that API here, and remove |channel|.
-  ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_UNKNOWN);
+  ScopedCurrentChannel channel(version_info::Channel::UNKNOWN);
 
   ExtensionService* extension_service = env_.GetExtensionService();
 
   // 1. Add an extension, before rules registry gets created.
   std::string error;
   scoped_refptr<Extension> extension(
       LoadManifestUnchecked("permissions",
                             "web_request_all_host_permissions.json",
                             Manifest::INVALID_LOCATION,
                             Extension::NO_FLAGS,
@@ skipping 39 matching lines @@
 
   int write_count = store->write_count();
   EXPECT_EQ("", AddRule(extension1_->id(), kRuleId));
   EXPECT_EQ("", AddRule(extension2_->id(), kRule2Id));
   env_.GetExtensionSystem()->SetReady();
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(write_count + 2, store->write_count());
 }
 
 }  //  namespace extensions