| Index: shell/shell_test_base_unittest.cc
 | 
| diff --git a/mojo/shell/shell_test_base_unittest.cc b/shell/shell_test_base_unittest.cc
 | 
| similarity index 96%
 | 
| rename from mojo/shell/shell_test_base_unittest.cc
 | 
| rename to shell/shell_test_base_unittest.cc
 | 
| index 620b2680cab966aa86b358975a049a18c94e6c98..d6dbb455b168e48472d32f00fd70c7b314910668 100644
 | 
| --- a/mojo/shell/shell_test_base_unittest.cc
 | 
| +++ b/shell/shell_test_base_unittest.cc
 | 
| @@ -2,7 +2,7 @@
 | 
|  // Use of this source code is governed by a BSD-style license that can be
 | 
|  // found in the LICENSE file.
 | 
|  
 | 
| -#include "mojo/shell/shell_test_base.h"
 | 
| +#include "shell/shell_test_base.h"
 | 
|  
 | 
|  #include "base/bind.h"
 | 
|  #include "base/i18n/time_formatting.h"
 | 
| @@ -45,25 +45,25 @@ class ShellTestBaseTest : public ShellTestBase {
 | 
|    template <typename T>
 | 
|    base::Callback<void()> SetAndQuit(T* val, T result) {
 | 
|      return base::Bind(&ShellTestBaseTest::SetAndQuitImpl<T>,
 | 
| -        base::Unretained(this), val, result);
 | 
| +                      base::Unretained(this), val, result);
 | 
|    }
 | 
|    template <typename T>
 | 
|    base::Callback<void(T result)> SetAndQuit(T* val) {
 | 
| -      return base::Bind(&ShellTestBaseTest::SetAndQuitImpl<T>,
 | 
| -          base::Unretained(this), val);
 | 
| +    return base::Bind(&ShellTestBaseTest::SetAndQuitImpl<T>,
 | 
| +                      base::Unretained(this), val);
 | 
|    }
 | 
|    static GURL test_app_url() { return GURL("mojo:test_app"); }
 | 
|  
 | 
|    void GetReport(std::vector<ServiceReport>* report) {
 | 
|      ConnectToService(GURL("mojo:test_request_tracker_app"), &request_tracking_);
 | 
|      request_tracking_->GetReport(base::Bind(&GetReportCallback,
 | 
| -        base::Unretained(message_loop()),
 | 
| -        base::Unretained(report)));
 | 
| +                                            base::Unretained(message_loop()),
 | 
| +                                            base::Unretained(report)));
 | 
|      message_loop()->Run();
 | 
|    }
 | 
|  
 | 
|   private:
 | 
| -  template<typename T>
 | 
| +  template <typename T>
 | 
|    void SetAndQuitImpl(T* val, T result) {
 | 
|      *val = result;
 | 
|      message_loop()->QuitWhenIdle();
 | 
| 
 |