Fix handling of Storage url() on desktop, and add an integration test to ensure

it gives the correct result when you create a Storage instance with an explicit
or implicit url.

PiperOrigin-RevId: 272991890

Author: jonsimantov

storage/src/common/storage.cc

@@ -184,9 +184,7 @@ StorageReference Storage::GetReferenceFromUrl(const char* url) const {
 
   static const char kObjectName[] = "StorageReference";
   // Extract components from this storage object's URL.
-  std::string this_bucket;
-  internal::UriToComponents(const_cast<Storage*>(this)->url(), kObjectName,
-                            &this_bucket, nullptr);
+  std::string this_bucket = const_cast<Storage*>(this)->GetReference().bucket();
   // Make sure the specified URL is valid.
   std::string bucket;
   bool valid = internal::UriToComponents(std::string(url), kObjectName, &bucket,

storage/src/desktop/storage_desktop.cc

@@ -32,19 +32,20 @@ namespace internal {
 
 StorageInternal::StorageInternal(App* app, const char* url) {
   app_ = app;
+
   if (url) {
     url_ = url;
+    root_ = StoragePath(url_);
   } else {
     const char* bucket = app->options().storage_bucket();
-    if (bucket) url_ = std::string(kGsScheme) + bucket;
+    root_ = StoragePath(bucket ? std::string(kGsScheme) + bucket : "");
   }
-  root_ = StoragePath(url_);
 
   // LINT.IfChange
   max_download_retry_time_ = 600.0;
   max_operation_retry_time_ = 120.0;
   max_upload_retry_time_ = 600.0;
-  // LINT.ThenChange(//depot_android_gmscore_dev/\
+  // LINT.ThenChange(//depot/google3/java/com/google/android/gmscore/integ/\
   //            client/firebase-storage-api/src/com/google/firebase/\
   //            storage/FirebaseStorage.java,
   //         //depot_firebase_ios_Releases/FirebaseStorage/\
@@ -126,8 +127,8 @@ void StorageInternal::CleanupCompletedOperations() {
   for (auto it = operations_.begin(); it != operations_.end(); ++it) {
     if ((*it)->is_complete()) operations_to_delete.push_back(*it);
   }
-  for (auto it = operations_to_delete.begin();
-       it != operations_to_delete.end(); ++it) {
+  for (auto it = operations_to_delete.begin(); it != operations_to_delete.end();
+       ++it) {
     RemoveOperation(*it);
     delete *it;
   }

storage/src/desktop/storage_desktop.h

@@ -39,7 +39,7 @@ class StorageInternal {
   // Get the firease::App that this Storage was created with.
   ::firebase::App* app() { return app_; }
 
-  // Return the URL we were created with.
+  // Return the URL we were created with, if we were created with it explicitly.
   std::string url() { return url_; }
 
   // Get a StorageReference to the root of the database.