Remove all uses of EmptyString16(), EmptyWString(), and EmptyGURL(), and thei...

webkit/appcache/appcache_host_unittest.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "base/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/appcache/appcache.h"
 #include "webkit/appcache/appcache_group.h"
 #include "webkit/appcache/appcache_host.h"
 #include "webkit/appcache/mock_appcache_service.h"
 
@@ skipping 103 matching lines @@
   EXPECT_EQ(reinterpret_cast<void*>(3), last_callback_param_);
 }
 
 TEST_F(AppCacheHostTest, SelectNoCache) {
   // Reset our mock frontend
   mock_frontend_.last_cache_id_ = -333;
   mock_frontend_.last_host_id_ = -333;
   mock_frontend_.last_status_ = OBSOLETE;
 
   AppCacheHost host(1, &mock_frontend_, &service_);
-  host.SelectCache(GURL("http://whatever/"), kNoCacheId, GURL::EmptyGURL());
+  host.SelectCache(GURL("http://whatever/"), kNoCacheId, GURL());
 
   // We should have received an OnCacheSelected msg
   EXPECT_EQ(1, mock_frontend_.last_host_id_);
   EXPECT_EQ(kNoCacheId, mock_frontend_.last_cache_id_);
   EXPECT_EQ(UNCACHED, mock_frontend_.last_status_);
 
   // Otherwise, see that it respond as if there is no cache selected.
   EXPECT_EQ(1, host.host_id());
   EXPECT_EQ(&service_, host.service());
   EXPECT_EQ(&mock_frontend_, host.frontend());
@@ skipping 92 matching lines @@
   EXPECT_EQ(UNCACHED, last_status_result_);
   EXPECT_EQ(reinterpret_cast<void*>(1), last_callback_param_);
 }
 
 TEST_F(AppCacheHostTest, SetSwappableCache) {
   AppCacheHost host(1, &mock_frontend_, &service_);
   host.SetSwappableCache(NULL);
   EXPECT_FALSE(host.swappable_cache_.get());
 
   scoped_refptr<AppCacheGroup> group1 =
-      new AppCacheGroup(&service_, GURL::EmptyGURL(),
-                        service_.storage()->NewGroupId());
+      new AppCacheGroup(&service_, GURL(), service_.storage()->NewGroupId());
   host.SetSwappableCache(group1);
   EXPECT_FALSE(host.swappable_cache_.get());
 
   AppCache* cache1 = new AppCache(&service_, 111);
   cache1->set_complete(true);
   group1->AddCache(cache1);
   host.SetSwappableCache(group1);
   EXPECT_EQ(cache1, host.swappable_cache_.get());
 
   mock_frontend_.last_host_id_ = -222;  // to verify we received OnCacheSelected
@@ skipping 43 matching lines @@
   group2->RemoveCache(cache5);
   EXPECT_FALSE(group2->HasCache());
   host.group_being_updated_ = group2;
   host.OnUpdateComplete(group2);
   EXPECT_FALSE(host.group_being_updated_);
   EXPECT_FALSE(host.swappable_cache_.get());  // group2 had no newest cache
 }
 
 }  // namespace appcache