Revert "Update all users of base::Version to explicitly specify the namespace, and clean up the hea…

chrome/browser/component_updater/test/component_updater_service_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 "chrome/browser/component_updater/test/component_updater_service_unittest.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ skipping 191 matching lines @@
   return test_data_dir_.AppendASCII(file);
 }
 
 TestConfigurator* ComponentUpdaterTest::test_configurator() {
   return test_config_;
 }
 
 ComponentUpdateService::Status ComponentUpdaterTest::RegisterComponent(
     CrxComponent* com,
     TestComponents component,
-    const base::Version& version,
+    const Version& version,
     TestInstaller* installer) {
   if (component == kTestComponent_abag) {
     com->name = "test_abag";
     com->pk_hash.assign(abag_hash, abag_hash + arraysize(abag_hash));
   } else if (component == kTestComponent_jebg) {
     com->name = "test_jebg";
     com->pk_hash.assign(jebg_hash, jebg_hash + arraysize(jebg_hash));
   } else {
     com->name = "test_ihfo";
     com->pk_hash.assign(ihfo_hash, ihfo_hash + arraysize(ihfo_hash));
@@ skipping 58 matching lines @@
       "updatecheck"), test_file("updatecheck_reply_1.xml")));
   EXPECT_TRUE(post_interceptor_->ExpectRequest(new PartialMatch(
       "updatecheck"), test_file("updatecheck_reply_1.xml")));
 
   TestInstaller installer;
   CrxComponent com;
   com.observer = &observer;
   EXPECT_EQ(ComponentUpdateService::kOk,
             RegisterComponent(&com,
                               kTestComponent_abag,
-                              base::Version("1.1"),
+                              Version("1.1"),
                               &installer));
 
   // We loop twice, but there are no updates so we expect two sleep messages.
   test_configurator()->SetLoopCount(2);
   component_updater()->Start();
   RunThreads();
 
   EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
   EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->install_count());
 
@@ skipping 117 matching lines @@
   EXPECT_TRUE(post_interceptor_->ExpectRequest(new PartialMatch(
       "updatecheck"), test_file("updatecheck_reply_1.xml")));
 
   get_interceptor_->SetResponse(
       GURL(expected_crx_url),
       test_file("jebgalgnebhfojomionfpkfelancnnkf.crx"));
 
   TestInstaller installer1;
   CrxComponent com1;
   com1.observer = &observer1;
-  RegisterComponent(
-      &com1, kTestComponent_jebg, base::Version("0.9"), &installer1);
+  RegisterComponent(&com1, kTestComponent_jebg, Version("0.9"), &installer1);
   TestInstaller installer2;
   CrxComponent com2;
   com2.observer = &observer2;
-  RegisterComponent(
-      &com2, kTestComponent_abag, base::Version("2.2"), &installer2);
+  RegisterComponent(&com2, kTestComponent_abag, Version("2.2"), &installer2);
 
   test_configurator()->SetLoopCount(2);
   component_updater()->Start();
   RunThreads();
 
   EXPECT_EQ(0, static_cast<TestInstaller*>(com1.installer)->error());
   EXPECT_EQ(1, static_cast<TestInstaller*>(com1.installer)->install_count());
   EXPECT_EQ(0, static_cast<TestInstaller*>(com2.installer)->error());
   EXPECT_EQ(0, static_cast<TestInstaller*>(com2.installer)->install_count());
 
@@ skipping 44 matching lines @@
 TEST_F(ComponentUpdaterTest, ProdVersionCheck) {
   EXPECT_TRUE(post_interceptor_->ExpectRequest(new PartialMatch(
       "updatecheck"), test_file("updatecheck_reply_2.xml")));
 
   get_interceptor_->SetResponse(
       GURL(expected_crx_url),
       test_file("jebgalgnebhfojomionfpkfelancnnkf.crx"));
 
   TestInstaller installer;
   CrxComponent com;
-  RegisterComponent(
-      &com, kTestComponent_jebg, base::Version("0.9"), &installer);
+  RegisterComponent(&com, kTestComponent_jebg, Version("0.9"), &installer);
 
   test_configurator()->SetLoopCount(1);
   component_updater()->Start();
   RunThreads();
 
   // Expect one update check and no ping.
   EXPECT_EQ(1, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(1, post_interceptor_->GetCount())
       << post_interceptor_->GetRequestsAsString();
@@ skipping 69 matching lines @@
   EXPECT_TRUE(post_interceptor_->ExpectRequest(new PartialMatch(
       "updatecheck"), test_file("updatecheck_reply_empty")));
 
   get_interceptor_->SetResponse(
       GURL(expected_crx_url),
       test_file("jebgalgnebhfojomionfpkfelancnnkf.crx"));
 
   TestInstaller installer1;
   CrxComponent com1;
   com1.observer = &observer1;
-  RegisterComponent(
-      &com1, kTestComponent_abag, base::Version("2.2"), &installer1);
+  RegisterComponent(&com1, kTestComponent_abag, Version("2.2"), &installer1);
   TestInstaller installer2;
   CrxComponent com2;
   com2.observer = &observer2;
-  RegisterComponent(
-      &com2, kTestComponent_jebg, base::Version("0.9"), &installer2);
+  RegisterComponent(&com2, kTestComponent_jebg, Version("0.9"), &installer2);
 
   // No update normally.
   test_configurator()->SetLoopCount(1);
   component_updater()->Start();
   RunThreads();
   component_updater()->Stop();
 
   EXPECT_EQ(1, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(1, post_interceptor_->GetCount())
@@ skipping 200 matching lines @@
   EXPECT_TRUE(post_interceptor_->ExpectRequest(new PartialMatch(
       "updatecheck"), test_file("updatecheck_reply_1.xml")));
 
   get_interceptor_->SetResponse(
       GURL(expected_crx_url),
       test_file("jebgalgnebhfojomionfpkfelancnnkf.crx"));
 
   TestInstaller installer1;
   CrxComponent com1;
   com1.observer = &observer1;
-  RegisterComponent(
-      &com1, kTestComponent_jebg, base::Version("0.9"), &installer1);
+  RegisterComponent(&com1, kTestComponent_jebg, Version("0.9"), &installer1);
   TestInstaller installer2;
   CrxComponent com2;
   com2.observer = &observer2;
-  RegisterComponent(
-      &com2, kTestComponent_abag, base::Version("2.2"), &installer2);
+  RegisterComponent(&com2, kTestComponent_abag, Version("2.2"), &installer2);
 
   // Loop twice to issue two checks: (1) with original 0.9 version, update to
   // 1.0, and do the second check (2) with the updated 1.0 version.
   test_configurator()->SetLoopCount(2);
   component_updater()->Start();
   RunThreads();
 
   EXPECT_EQ(0, static_cast<TestInstaller*>(com1.installer)->error());
   EXPECT_EQ(1, static_cast<TestInstaller*>(com1.installer)->install_count());
   EXPECT_EQ(0, static_cast<TestInstaller*>(com2.installer)->error());
@@ skipping 49 matching lines @@
   }
 
   post_interceptor_->Reset();
   EXPECT_TRUE(post_interceptor_->ExpectRequest(new PartialMatch(
       "updatecheck"), test_file("updatecheck_reply_1.xml")));
 
   TestInstaller installer3;
   EXPECT_EQ(ComponentUpdateService::kReplaced,
             RegisterComponent(&com1,
                               kTestComponent_jebg,
-                              base::Version("2.2"),
+                              Version("2.2"),
                               &installer3));
 
   // Loop once just to notice the check happening with the re-register version.
   test_configurator()->SetLoopCount(1);
   component_updater()->Start();
   RunThreads();
 
   // We created a new installer, so the counts go back to 0.
   EXPECT_EQ(0, static_cast<TestInstaller*>(com1.installer)->error());
   EXPECT_EQ(0, static_cast<TestInstaller*>(com1.installer)->install_count());
@@ skipping 37 matching lines @@
   get_interceptor_->SetResponse(
       GURL("http://localhost/download/ihfokbkgjpifnbbojhneepfflplebdkc_1.crx"),
       test_file("ihfokbkgjpifnbbojhneepfflplebdkc_1.crx"));
   get_interceptor_->SetResponse(
       GURL("http://localhost/download/"
            "ihfokbkgjpifnbbojhneepfflplebdkc_1to2.crx"),
       test_file("ihfokbkgjpifnbbojhneepfflplebdkc_1to2.crx"));
 
   VersionedTestInstaller installer;
   CrxComponent com;
-  RegisterComponent(
-      &com, kTestComponent_ihfo, base::Version("0.0"), &installer);
+  RegisterComponent(&com, kTestComponent_ihfo, Version("0.0"), &installer);
 
   test_configurator()->SetLoopCount(3);
   component_updater()->Start();
   RunThreads();
 
   EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
   EXPECT_EQ(2, static_cast<TestInstaller*>(com.installer)->install_count());
 
   EXPECT_EQ(5, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
@@ skipping 50 matching lines @@
   get_interceptor_->SetResponse(
       GURL("http://localhost/download/"
            "ihfokbkgjpifnbbojhneepfflplebdkc_1to2.crx"),
       test_file("ihfokbkgjpifnbbojhneepfflplebdkc_1to2.crx"));
   get_interceptor_->SetResponse(
       GURL("http://localhost/download/ihfokbkgjpifnbbojhneepfflplebdkc_2.crx"),
       test_file("ihfokbkgjpifnbbojhneepfflplebdkc_2.crx"));
 
   TestInstaller installer;
   CrxComponent com;
-  RegisterComponent(
-      &com, kTestComponent_ihfo, base::Version("1.0"), &installer);
+  RegisterComponent(&com, kTestComponent_ihfo, Version("1.0"), &installer);
 
   test_configurator()->SetLoopCount(2);
   component_updater()->Start();
   RunThreads();
 
   // A failed differential update does not count as a failed install.
   EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
   EXPECT_EQ(1, static_cast<TestInstaller*>(com.installer)->install_count());
 
   EXPECT_EQ(3, post_interceptor_->GetHitCount())
@@ skipping 45 matching lines @@
       "updatecheck"), test_file("updatecheck_reply_1.xml")));
   EXPECT_TRUE(post_interceptor_->ExpectRequest(new PartialMatch("event")));
   get_interceptor_->SetResponse(
       GURL(expected_crx_url),
       test_file("jebgalgnebhfojomionfpkfelancnnkf.crx"));
 
   // Start with 0.9, and attempt update to 1.0.
   // Loop twice to issue two checks: (1) with original 0.9 version
   // and (2), which should retry with 0.9.
   CrxComponent com;
-  RegisterComponent(
-      &com, kTestComponent_jebg, base::Version("0.9"), &installer);
+  RegisterComponent(&com, kTestComponent_jebg, Version("0.9"), &installer);
 
   test_configurator()->SetLoopCount(2);
   component_updater()->Start();
   RunThreads();
 
   EXPECT_EQ(4, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(2, get_interceptor_->GetHitCount());
 
   EXPECT_NE(string::npos, post_interceptor_->GetRequests()[0].find(
@@ skipping 67 matching lines @@
   get_interceptor_->SetResponse(
       GURL("http://localhost/download/"
            "ihfokbkgjpifnbbojhneepfflplebdkc_1to2.crx"),
       test_file("ihfokbkgjpifnbbojhneepfflplebdkc_1to2_bad.crx"));
   get_interceptor_->SetResponse(
       GURL("http://localhost/download/ihfokbkgjpifnbbojhneepfflplebdkc_2.crx"),
       test_file("ihfokbkgjpifnbbojhneepfflplebdkc_2.crx"));
 
   VersionedTestInstaller installer;
   CrxComponent com;
-  RegisterComponent(
-      &com, kTestComponent_ihfo, base::Version("0.0"), &installer);
+  RegisterComponent(&com, kTestComponent_ihfo, Version("0.0"), &installer);
 
   test_configurator()->SetLoopCount(3);
   component_updater()->Start();
   RunThreads();
   component_updater()->Stop();
 
   EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
   EXPECT_EQ(2, static_cast<TestInstaller*>(com.installer)->install_count());
 
   EXPECT_EQ(5, post_interceptor_->GetHitCount())
@@ skipping 84 matching lines @@
 
   EXPECT_TRUE(post_interceptor_->ExpectRequest(new PartialMatch(
       "updatecheck"), test_file("updatecheck_reply_1.xml")));
 
   TestInstaller installer;
   CrxComponent com;
   com.observer = &observer;
   EXPECT_EQ(ComponentUpdateService::kOk,
             RegisterComponent(&com,
                               kTestComponent_abag,
-                              base::Version("1.1"),
+                              Version("1.1"),
                               &installer));
   // The following two calls ensure that we don't do an update check via the
   // timer, so the only update check should be the on-demand one.
   test_configurator()->SetInitialDelay(1000000);
   test_configurator()->SetRecheckTime(1000000);
   test_configurator()->SetLoopCount(1);
   component_updater()->Start();
 
   RunThreadsUntilIdle();
 
@@ skipping 64 matching lines @@
 
   EXPECT_TRUE(post_interceptor_->ExpectRequest(new PartialMatch(
       "updatecheck"), test_file("updatecheck_reply_1.xml")));
 
   TestInstaller installer;
   CrxComponent com;
   com.observer = &observer;
   EXPECT_EQ(ComponentUpdateService::kOk,
             RegisterComponent(&com,
                               kTestComponent_abag,
-                              base::Version("1.1"),
+                              Version("1.1"),
                               &installer));
   // The following two calls ensure that we don't do an update check via the
   // timer, so the only update check should be the on-demand one.
   test_configurator()->SetInitialDelay(1000000);
   test_configurator()->SetRecheckTime(1000000);
   test_configurator()->SetLoopCount(1);
   component_updater()->Start();
 
   RunThreadsUntilIdle();
 
@@ skipping 14 matching lines @@
   EXPECT_EQ(1, post_interceptor_->GetHitCount());
   EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->error());
   EXPECT_EQ(0, static_cast<TestInstaller*>(com.installer)->install_count());
 
   component_updater()->Stop();
 }
 
 
 }  // namespace component_updater