Move the unit tests files side-by-side with the corresponding .cc files.

chrome/browser/component_updater/component_updater_service_unittest.cc

 // Copyright 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 "chrome/browser/component_updater/component_updater_service_unittest.h"
 
 #include <vector>
 
 #include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/component_updater/component_updater_resource_throttle.h"
 #include "chrome/common/chrome_paths.h"
-#include "components/update_client/test/test_configurator.h"
-#include "components/update_client/test/test_installer.h"
-#include "components/update_client/test/url_request_post_interceptor.h"
+#include "components/update_client/test_configurator.h"
+#include "components/update_client/test_installer.h"
+#include "components/update_client/url_request_post_interceptor.h"
 #include "components/update_client/utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/resource_throttle.h"
 #include "libxml/globals.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/url_request/test_url_request_interceptor.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
@@ skipping 323 matching lines @@
           "<app appid=\"jebgalgnebhfojomionfpkfelancnnkf\" version=\"0.9\">"
           "<updatecheck /></app>"))
       << post_interceptor_->GetRequestsAsString();
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[0].find(
           "<app appid=\"abagagagagagagagagagagagagagagag\" version=\"2.2\">"
           "<updatecheck /></app>"))
       << post_interceptor_->GetRequestsAsString();
 
-  EXPECT_NE(
-      string::npos,
-      post_interceptor_->GetRequests()[1].find(
-          "<app appid=\"jebgalgnebhfojomionfpkfelancnnkf\" "
-          "version=\"0.9\" nextversion=\"1.0\">"
-          "<event eventtype=\"3\" eventresult=\"1\"/>"))
+  EXPECT_NE(string::npos, post_interceptor_->GetRequests()[1].find(
+                              "<app appid=\"jebgalgnebhfojomionfpkfelancnnkf\" "
+                              "version=\"0.9\" nextversion=\"1.0\">"
+                              "<event eventtype=\"3\" eventresult=\"1\"/>"))
       << post_interceptor_->GetRequestsAsString();
 
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[2].find(
           "<app appid=\"jebgalgnebhfojomionfpkfelancnnkf\" version=\"1.0\">"
           "<updatecheck /></app>"));
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[2].find(
           "<app appid=\"abagagagagagagagagagagagagagagag\" version=\"2.2\">"
           "<updatecheck /></app>"))
       << post_interceptor_->GetRequestsAsString();
 
   // Test the protocol version is correct and the extra request attributes
   // are included in the request.
-  EXPECT_NE(
-      string::npos,
-      post_interceptor_->GetRequests()[0].find(
-          "request protocol=\"3.0\" extra=\"foo\""))
+  EXPECT_NE(string::npos, post_interceptor_->GetRequests()[0].find(
+                              "request protocol=\"3.0\" extra=\"foo\""))
       << post_interceptor_->GetRequestsAsString();
 
   // Tokenize the request string to look for specific attributes, which
   // are important for backward compatibility with the version v2 of the update
   // protocol. In this case, inspect the <request>, which is the first element
   // after the xml declaration of the update request body.
   // Expect to find the |os|, |arch|, |prodchannel|, and |prodversion|
   // attributes:
   // <?xml version="1.0" encoding="UTF-8"?>
   // <request... os=... arch=... prodchannel=... prodversion=...>
@@ skipping 140 matching lines @@
 
   EXPECT_EQ(2, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(2, post_interceptor_->GetCount())
       << post_interceptor_->GetRequestsAsString();
 
   EXPECT_EQ(1, get_interceptor_->GetHitCount());
 
   // Expect the update check to contain an "ondemand" request for the
   // second component (com2) and a normal request for the other component.
-  EXPECT_NE(
-      string::npos,
-      post_interceptor_->GetRequests()[0].find(
-          "<app appid=\"abagagagagagagagagagagagagagagag\" "
-          "version=\"2.2\"><updatecheck /></app>"))
+  EXPECT_NE(string::npos, post_interceptor_->GetRequests()[0].find(
+                              "<app appid=\"abagagagagagagagagagagagagagagag\" "
+                              "version=\"2.2\"><updatecheck /></app>"))
       << post_interceptor_->GetRequestsAsString();
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[0].find(
           "<app appid=\"jebgalgnebhfojomionfpkfelancnnkf\" "
           "version=\"0.9\" installsource=\"ondemand\"><updatecheck /></app>"))
       << post_interceptor_->GetRequestsAsString();
-  EXPECT_NE(
-      string::npos,
-      post_interceptor_->GetRequests()[1].find(
-          "<app appid=\"jebgalgnebhfojomionfpkfelancnnkf\" "
-          "version=\"0.9\" nextversion=\"1.0\">"
-          "<event eventtype=\"3\" eventresult=\"1\"/>"))
+  EXPECT_NE(string::npos, post_interceptor_->GetRequests()[1].find(
+                              "<app appid=\"jebgalgnebhfojomionfpkfelancnnkf\" "
+                              "version=\"0.9\" nextversion=\"1.0\">"
+                              "<event eventtype=\"3\" eventresult=\"1\"/>"))
       << post_interceptor_->GetRequestsAsString();
 
   // Also check what happens if previous check too soon. It works, since this
   // direct OnDemand call does not implement a cooldown.
   test_configurator()->SetOnDemandTime(60 * 60);
   EXPECT_EQ(Status::kOk, OnDemandTester::OnDemand(component_updater(),
                                                   GetCrxComponentID(com2)));
   // Okay, now reset to 0 for the other tests.
   test_configurator()->SetOnDemandTime(0);
   component_updater()->Stop();
@@ skipping 124 matching lines @@
   EXPECT_EQ(3, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(1, get_interceptor_->GetHitCount());
 
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[0].find(
           "<app appid=\"jebgalgnebhfojomionfpkfelancnnkf\" version=\"0.9\">"
           "<updatecheck /></app>"))
       << post_interceptor_->GetRequestsAsString();
-  EXPECT_NE(
-      string::npos,
-      post_interceptor_->GetRequests()[1].find(
-          "<app appid=\"jebgalgnebhfojomionfpkfelancnnkf\" "
-          "version=\"0.9\" nextversion=\"1.0\">"
-          "<event eventtype=\"3\" eventresult=\"1\"/>"))
+  EXPECT_NE(string::npos, post_interceptor_->GetRequests()[1].find(
+                              "<app appid=\"jebgalgnebhfojomionfpkfelancnnkf\" "
+                              "version=\"0.9\" nextversion=\"1.0\">"
+                              "<event eventtype=\"3\" eventresult=\"1\"/>"))
       << post_interceptor_->GetRequestsAsString();
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[2].find(
           "<app appid=\"jebgalgnebhfojomionfpkfelancnnkf\" version=\"1.0\">"
           "<updatecheck /></app>"))
       << post_interceptor_->GetRequestsAsString();
 
   component_updater()->Stop();
 
@@ skipping 66 matching lines @@
       test_file("updatecheck_diff_reply_2.xml")));
   EXPECT_TRUE(post_interceptor_->ExpectRequest(new PartialMatch("event")));
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"),
       test_file("updatecheck_diff_reply_3.xml")));
 
   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"),
+      GURL(
+          "http://localhost/download/"
+          "ihfokbkgjpifnbbojhneepfflplebdkc_1to2.crx"),
       test_file("ihfokbkgjpifnbbojhneepfflplebdkc_1to2.crx"));
 
   scoped_refptr<TestInstaller> installer(new VersionedTestInstaller);
   CrxComponent com;
   RegisterComponent(&com, kTestComponent_ihfo, Version("0.0"), installer);
 
   test_configurator()->SetLoopCount(3);
   component_updater()->Start();
   RunThreads();
 
   EXPECT_EQ(0, installer->error());
   EXPECT_EQ(2, installer->install_count());
 
   EXPECT_EQ(5, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(5, post_interceptor_->GetCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(2, get_interceptor_->GetHitCount());
 
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[0].find(
           "<app appid=\"ihfokbkgjpifnbbojhneepfflplebdkc\" version=\"0.0\">"
           "<updatecheck /></app>"))
       << post_interceptor_->GetRequestsAsString();
-  EXPECT_NE(
-      string::npos,
-      post_interceptor_->GetRequests()[1].find(
-          "<app appid=\"ihfokbkgjpifnbbojhneepfflplebdkc\" "
-          "version=\"0.0\" nextversion=\"1.0\">"
-          "<event eventtype=\"3\" eventresult=\"1\" nextfp=\"1\"/>"))
+  EXPECT_NE(string::npos,
+            post_interceptor_->GetRequests()[1].find(
+                "<app appid=\"ihfokbkgjpifnbbojhneepfflplebdkc\" "
+                "version=\"0.0\" nextversion=\"1.0\">"
+                "<event eventtype=\"3\" eventresult=\"1\" nextfp=\"1\"/>"))
       << post_interceptor_->GetRequestsAsString();
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[2].find(
           "<app appid=\"ihfokbkgjpifnbbojhneepfflplebdkc\" version=\"1.0\">"
           "<updatecheck /><packages><package fp=\"1\"/></packages></app>"))
       << post_interceptor_->GetRequestsAsString();
-  EXPECT_NE(
-      string::npos,
-      post_interceptor_->GetRequests()[3].find(
-          "<app appid=\"ihfokbkgjpifnbbojhneepfflplebdkc\" "
-          "version=\"1.0\" nextversion=\"2.0\">"
-          "<event eventtype=\"3\" eventresult=\"1\" diffresult=\"1\" "
-          "previousfp=\"1\" nextfp=\"22\"/>"))
+  EXPECT_NE(string::npos,
+            post_interceptor_->GetRequests()[3].find(
+                "<app appid=\"ihfokbkgjpifnbbojhneepfflplebdkc\" "
+                "version=\"1.0\" nextversion=\"2.0\">"
+                "<event eventtype=\"3\" eventresult=\"1\" diffresult=\"1\" "
+                "previousfp=\"1\" nextfp=\"22\"/>"))
       << post_interceptor_->GetRequestsAsString();
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[4].find(
           "<app appid=\"ihfokbkgjpifnbbojhneepfflplebdkc\" version=\"2.0\">"
           "<updatecheck /><packages><package fp=\"22\"/></packages></app>"))
       << post_interceptor_->GetRequestsAsString();
   component_updater()->Stop();
 }
 
@@ skipping 19 matching lines @@
       test_file("updatecheck_diff_reply_2.xml")));
   EXPECT_TRUE(post_interceptor_->ExpectRequest(new PartialMatch("event")));
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"),
       test_file("updatecheck_diff_reply_3.xml")));
 
   get_interceptor_->SetResponse(
       GURL("http://localhost/download/ihfokbkgjpifnbbojhneepfflplebdkc_1.crx"),
       test_file("ihfokbkgjpifnbbojhneepfflplebdkc_1.crx"));
   get_interceptor_->SetResponse(
-      GURL("http://localhost/download/"
+      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"));
 
   scoped_refptr<TestInstaller> installer(new TestInstaller);
   CrxComponent com;
   RegisterComponent(&com, kTestComponent_ihfo, Version("1.0"), installer);
 
@@ skipping 10 matching lines @@
   EXPECT_EQ(3, post_interceptor_->GetCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(2, get_interceptor_->GetHitCount());
 
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[0].find(
           "<app appid=\"ihfokbkgjpifnbbojhneepfflplebdkc\" version=\"1.0\">"
           "<updatecheck /></app>"))
       << post_interceptor_->GetRequestsAsString();
-  EXPECT_NE(
-      string::npos,
-      post_interceptor_->GetRequests()[1].find(
-          "<app appid=\"ihfokbkgjpifnbbojhneepfflplebdkc\" "
-          "version=\"1.0\" nextversion=\"2.0\">"
-          "<event eventtype=\"3\" eventresult=\"1\" diffresult=\"0\" "
-          "differrorcat=\"2\" differrorcode=\"16\" nextfp=\"22\"/>"))
+  EXPECT_NE(string::npos,
+            post_interceptor_->GetRequests()[1].find(
+                "<app appid=\"ihfokbkgjpifnbbojhneepfflplebdkc\" "
+                "version=\"1.0\" nextversion=\"2.0\">"
+                "<event eventtype=\"3\" eventresult=\"1\" diffresult=\"0\" "
+                "differrorcat=\"2\" differrorcode=\"16\" nextfp=\"22\"/>"))
       << post_interceptor_->GetRequestsAsString();
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[2].find(
           "<app appid=\"ihfokbkgjpifnbbojhneepfflplebdkc\" version=\"2.0\">"
           "<updatecheck /><packages><package fp=\"22\"/></packages></app>"))
       << post_interceptor_->GetRequestsAsString();
 
   component_updater()->Stop();
 }
 
 // Test is flakey on Android bots. See crbug.com/331420.
 #if defined(OS_ANDROID)
 #define MAYBE_CheckFailedInstallPing DISABLED_CheckFailedInstallPing
 #else
 #define MAYBE_CheckFailedInstallPing CheckFailedInstallPing
 #endif
 // Verify that a failed installation causes an install failure ping.
 TEST_F(ComponentUpdaterTest, MAYBE_CheckFailedInstallPing) {
   // This test installer reports installation failure.
   class FailingTestInstaller : public TestInstaller {
     bool Install(const base::DictionaryValue& manifest,
                  const base::FilePath& unpack_path) override {
       ++install_count_;
       base::DeleteFile(unpack_path, true);
       return false;
     }
+
    private:
     ~FailingTestInstaller() override {}
   };
   scoped_refptr<FailingTestInstaller> installer(new FailingTestInstaller);
 
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
   EXPECT_TRUE(post_interceptor_->ExpectRequest(new PartialMatch("event")));
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
@@ skipping 15 matching lines @@
   EXPECT_EQ(4, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(2, get_interceptor_->GetHitCount());
 
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[0].find(
           "<app appid=\"jebgalgnebhfojomionfpkfelancnnkf\" version=\"0.9\">"
           "<updatecheck /></app>"))
       << post_interceptor_->GetRequestsAsString();
-  EXPECT_NE(
-      string::npos,
-      post_interceptor_->GetRequests()[1].find(
-          "<app appid=\"jebgalgnebhfojomionfpkfelancnnkf\" "
-          "version=\"0.9\" nextversion=\"1.0\">"
-          "<event eventtype=\"3\" eventresult=\"0\" "
-          "errorcat=\"3\" errorcode=\"9\"/>"))
+  EXPECT_NE(string::npos, post_interceptor_->GetRequests()[1].find(
+                              "<app appid=\"jebgalgnebhfojomionfpkfelancnnkf\" "
+                              "version=\"0.9\" nextversion=\"1.0\">"
+                              "<event eventtype=\"3\" eventresult=\"0\" "
+                              "errorcat=\"3\" errorcode=\"9\"/>"))
       << post_interceptor_->GetRequestsAsString();
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[2].find(
           "<app appid=\"jebgalgnebhfojomionfpkfelancnnkf\" version=\"0.9\">"
           "<updatecheck /></app>"))
       << post_interceptor_->GetRequestsAsString();
-  EXPECT_NE(
-      string::npos,
-      post_interceptor_->GetRequests()[3].find(
-          "<app appid=\"jebgalgnebhfojomionfpkfelancnnkf\" "
-          "version=\"0.9\" nextversion=\"1.0\">"
-          "<event eventtype=\"3\" eventresult=\"0\" "
-          "errorcat=\"3\" errorcode=\"9\"/>"))
+  EXPECT_NE(string::npos, post_interceptor_->GetRequests()[3].find(
+                              "<app appid=\"jebgalgnebhfojomionfpkfelancnnkf\" "
+                              "version=\"0.9\" nextversion=\"1.0\">"
+                              "<event eventtype=\"3\" eventresult=\"0\" "
+                              "errorcat=\"3\" errorcode=\"9\"/>"))
       << post_interceptor_->GetRequestsAsString();
 
   // Loop once more, but expect no ping because a noupdate response is issued.
   // This is necessary to clear out the fire-and-forget ping from the previous
   // iteration.
   post_interceptor_->Reset();
   EXPECT_TRUE(post_interceptor_->ExpectRequest(
       new PartialMatch("updatecheck"),
       test_file("updatecheck_reply_noupdate.xml")));
 
@@ skipping 36 matching lines @@
       test_file("updatecheck_diff_reply_3.xml")));
 
   get_interceptor_->SetResponse(
       GURL("http://localhost/download/ihfokbkgjpifnbbojhneepfflplebdkc_1.crx"),
       test_file("ihfokbkgjpifnbbojhneepfflplebdkc_1.crx"));
   // This intercept returns a different file than what is specified in the
   // update check response and requested in the download. The file that is
   // actually dowloaded contains a patching error, an therefore, an error
   // is injected at the time of patching.
   get_interceptor_->SetResponse(
-      GURL("http://localhost/download/"
-           "ihfokbkgjpifnbbojhneepfflplebdkc_1to2.crx"),
+      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"));
 
   scoped_refptr<TestInstaller> installer(new VersionedTestInstaller);
   CrxComponent com;
   RegisterComponent(&com, kTestComponent_ihfo, Version("0.0"), installer);
 
   test_configurator()->SetLoopCount(3);
   component_updater()->Start();
   RunThreads();
   component_updater()->Stop();
 
   EXPECT_EQ(0, installer->error());
   EXPECT_EQ(2, installer->install_count());
 
   EXPECT_EQ(5, post_interceptor_->GetHitCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(5, post_interceptor_->GetCount())
       << post_interceptor_->GetRequestsAsString();
   EXPECT_EQ(3, get_interceptor_->GetHitCount());
 
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[0].find(
           "<app appid=\"ihfokbkgjpifnbbojhneepfflplebdkc\" version=\"0.0\">"
           "<updatecheck /></app>"))
       << post_interceptor_->GetRequestsAsString();
-  EXPECT_NE(
-      string::npos,
-      post_interceptor_->GetRequests()[1].find(
-          "<app appid=\"ihfokbkgjpifnbbojhneepfflplebdkc\" "
-          "version=\"0.0\" nextversion=\"1.0\">"
-          "<event eventtype=\"3\" eventresult=\"1\" nextfp=\"1\"/>"))
+  EXPECT_NE(string::npos,
+            post_interceptor_->GetRequests()[1].find(
+                "<app appid=\"ihfokbkgjpifnbbojhneepfflplebdkc\" "
+                "version=\"0.0\" nextversion=\"1.0\">"
+                "<event eventtype=\"3\" eventresult=\"1\" nextfp=\"1\"/>"))
       << post_interceptor_->GetRequestsAsString();
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[2].find(
           "<app appid=\"ihfokbkgjpifnbbojhneepfflplebdkc\" version=\"1.0\">"
           "<updatecheck /><packages><package fp=\"1\"/></packages></app>"))
       << post_interceptor_->GetRequestsAsString();
-  EXPECT_NE(
-      string::npos,
-      post_interceptor_->GetRequests()[3].find(
-          "<app appid=\"ihfokbkgjpifnbbojhneepfflplebdkc\" "
-          "version=\"1.0\" nextversion=\"2.0\">"
-          "<event eventtype=\"3\" eventresult=\"1\" "
-          "diffresult=\"0\" differrorcat=\"2\" "
-          "differrorcode=\"14\" diffextracode1=\"305\" "
-          "previousfp=\"1\" nextfp=\"22\"/>"))
+  EXPECT_NE(string::npos, post_interceptor_->GetRequests()[3].find(
+                              "<app appid=\"ihfokbkgjpifnbbojhneepfflplebdkc\" "
+                              "version=\"1.0\" nextversion=\"2.0\">"
+                              "<event eventtype=\"3\" eventresult=\"1\" "
+                              "diffresult=\"0\" differrorcat=\"2\" "
+                              "differrorcode=\"14\" diffextracode1=\"305\" "
+                              "previousfp=\"1\" nextfp=\"22\"/>"))
       << post_interceptor_->GetRequestsAsString();
   EXPECT_NE(
       string::npos,
       post_interceptor_->GetRequests()[4].find(
           "<app appid=\"ihfokbkgjpifnbbojhneepfflplebdkc\" version=\"2.0\">"
           "<updatecheck /><packages><package fp=\"22\"/></packages></app>"))
       << post_interceptor_->GetRequestsAsString();
 }
 
 class TestResourceController : public content::ResourceController {
  public:
   virtual void SetThrottle(content::ResourceThrottle* throttle) {}
 };
 
 content::ResourceThrottle* RequestTestResourceThrottle(
     ComponentUpdateService* cus,
     TestResourceController* controller,
     const char* crx_id) {
   net::TestURLRequestContext context;
   scoped_ptr<net::URLRequest> url_request(context.CreateRequest(
-      GURL("http://foo.example.com/thing.bin"),
-      net::DEFAULT_PRIORITY,
-      NULL));
+      GURL("http://foo.example.com/thing.bin"), net::DEFAULT_PRIORITY, NULL));
 
   content::ResourceThrottle* rt = GetOnDemandResourceThrottle(cus, crx_id);
   rt->set_controller_for_testing(controller);
   controller->SetThrottle(rt);
   return rt;
 }
 
 void RequestAndDeleteResourceThrottle(ComponentUpdateService* cus,
                                       const char* crx_id) {
   // By requesting a throttle and deleting it immediately we ensure that we
@@ skipping 35 matching lines @@
   // 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();
 
   EXPECT_EQ(0, post_interceptor_->GetHitCount());
 
-  BrowserThread::PostTask(BrowserThread::IO,
-                          FROM_HERE,
-                          base::Bind(&RequestAndDeleteResourceThrottle,
-                                     component_updater(),
-                                     "abagagagagagagagagagagagagagagag"));
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      base::Bind(&RequestAndDeleteResourceThrottle, component_updater(),
+                 "abagagagagagagagagagagagagagagag"));
 
   RunThreads();
 
   EXPECT_EQ(1, post_interceptor_->GetHitCount());
   EXPECT_EQ(0, installer->error());
   EXPECT_EQ(0, installer->install_count());
 
   component_updater()->Stop();
 }
 
 class CancelResourceController : public TestResourceController {
  public:
   CancelResourceController() : throttle_(NULL), resume_called_(0) {}
   ~CancelResourceController() override {
     // Check that the throttle has been resumed by the time we
     // exit the test.
     CHECK_EQ(1, resume_called_);
     delete throttle_;
   }
   void Cancel() override { CHECK(false); }
   void CancelAndIgnore() override { CHECK(false); }
   void CancelWithError(int error_code) override { CHECK(false); }
   void Resume() override {
-    BrowserThread::PostTask(BrowserThread::IO,
-                            FROM_HERE,
+    BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                             base::Bind(&CancelResourceController::ResumeCalled,
                                        base::Unretained(this)));
   }
   void SetThrottle(content::ResourceThrottle* throttle) override {
     throttle_ = throttle;
     bool defer = false;
     // Initially the throttle is blocked. The CUS needs to run a
     // task on the UI thread to  decide if it should unblock.
     throttle_->WillStartRequest(&defer);
     CHECK(defer);
@@ skipping 45 matching lines @@
 
   RunThreadsUntilIdle();
 
   EXPECT_EQ(0, post_interceptor_->GetHitCount());
 
   {
     // First on-demand update check is expected to succeeded.
     CancelResourceController controller;
 
     BrowserThread::PostTask(
-        BrowserThread::IO,
-        FROM_HERE,
+        BrowserThread::IO, FROM_HERE,
         base::Bind(base::IgnoreResult(&RequestTestResourceThrottle),
-                   component_updater(),
-                   &controller,
+                   component_updater(), &controller,
                    "abagagagagagagagagagagagagagagag"));
 
     RunThreads();
 
     EXPECT_EQ(1, post_interceptor_->GetHitCount());
     EXPECT_EQ(0, installer->error());
     EXPECT_EQ(0, installer->install_count());
 
     component_updater()->Stop();
   }
 
   {
     // Second on-demand update check is expected to succeed as well, since there
     // is no cooldown interval between calls, due to calling SetOnDemandTime.
     test_configurator()->SetOnDemandTime(0);
     test_configurator()->SetLoopCount(1);
     component_updater()->Start();
 
     CancelResourceController controller;
 
     BrowserThread::PostTask(
-        BrowserThread::IO,
-        FROM_HERE,
+        BrowserThread::IO, FROM_HERE,
         base::Bind(base::IgnoreResult(&RequestTestResourceThrottle),
-                   component_updater(),
-                   &controller,
+                   component_updater(), &controller,
                    "abagagagagagagagagagagagagagagag"));
 
     RunThreads();
 
     EXPECT_EQ(1, post_interceptor_->GetHitCount());
     EXPECT_EQ(0, installer->error());
     EXPECT_EQ(0, installer->install_count());
 
     component_updater()->Stop();
   }
 
   {
     // This on-demand call is expected not to trigger a component update check.
     test_configurator()->SetOnDemandTime(1000000);
     component_updater()->Start();
 
     CancelResourceController controller;
 
     BrowserThread::PostTask(
-        BrowserThread::IO,
-        FROM_HERE,
+        BrowserThread::IO, FROM_HERE,
         base::Bind(base::IgnoreResult(&RequestTestResourceThrottle),
-                   component_updater(),
-                   &controller,
+                   component_updater(), &controller,
                    "abagagagagagagagagagagagagagagag"));
     RunThreadsUntilIdle();
   }
 }
 
 // Tests adding and removing observers.
 TEST_F(ComponentUpdaterTest, Observer) {
   MockServiceObserver observer1, observer2;
 
   // Expect that two observers see the events.
@@ skipping 56 matching lines @@
   component_updater()->RemoveObserver(&observer2);
 
   test_configurator()->SetLoopCount(1);
   component_updater()->Start();
   RunThreads();
 
   component_updater()->Stop();
 }
 
 }  // namespace component_updater